master-qa-5828

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