master-qa-5254

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