master-qa-5599

http://issues.liferay.com/LIFERAYQA-5599