master-qa-5601

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