master-qa-12216

http://issues.liferay.com/browse/LIFERAYQA-12216

@brianchandotcom 

I think there was a cherry pick error somewhere along the lines for ee-6.2.x.
So, I reverted some of the commits and cherry picked them back in..

Please see https://github.com/brianchandotcom/liferay-portal-ee/pull/7846 for more details