master-qa-5253

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