master-qa-5024

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