master-qa-7141

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