Merge branch 'master' into chrisda

Author: chrisda

exchange/exchange-ps/exchange/encryption-and-certificates/Set-OMEConfiguration.md

@@ -216,7 +216,7 @@ Accept wildcard characters: False
 ```
 
 ### -SocialIdSignIn
-The SocialSignIn parameter specifies whether to enable or disable authentication with Microsoft, Google, or Yahoo identities for this custom template. Valid values are:
+The SocialSignIn parameter specifies whether to enable or disable authentication with Microsoft, Google, or Yahoo identities for this custom template. This only applies to the new version of OME that is built on Azure RMS. Valid values are:
 
 - $true: Authentication using Microsoft, Google, or Yahoo identities is enabled. This is the default value.