master-qa-8995

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