master-qa-5322-2

http://issues.liferay.com/browse/LIFERAYQA-5322-2