Merge "servicetests: Whitespace updates" into rvc-dev