master-qa-8183

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