Merge remote-tracking branch 'origin/master' into membership_plus_console

Conflicts:
	cartridges/openshift-origin-cartridge-phpmyadmin/metadata/manifest.yml.f19
	cartridges/openshift-origin-cartridge-phpmyadmin/metadata/manifest.yml.rhel
Force resolving domains to avoid double query