master-qa-5517

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