Merge "Factor out proxy properties from OpenIdServiceImpl"