Merge commit '4bcf574b8a' into fix-google-permissions

Conflicts:
	functional-test/src/main/java/org/zanata/page/account/GooglePermissionsPage.java
	functional-test/src/main/java/org/zanata/page/account/OpenIDPage.java