master-qa-8722

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