master-qa-5947

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