master-qa-4991

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