master-qa-5974

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