master-qa-8934

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