master-qa-6013

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