master-qa-5529

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