Merge "Switch to doReturn notation for spy method mocking" into udc-qpr-dev