master-qa-5020

http://issues.liferay.com/browse/LIFERAYQA-5020