master-qa-7404

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