master-qa-8362

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