Merge "Re-enabled RestClientServiceTest"