master-qa-7342

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