master-qa-7411

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