master-qa-8199

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