master-qa-5019

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