master-qa-5270

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