master-qa-8053

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