master-qa-8177

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