master-qa-5885

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