master-qa-8994

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