master-qa-9522

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