master-qa-8522

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