master-qa-5107

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