master-qa-8111

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