master-qa-5032

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