master-qa-8161

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