master-qa-5027

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