master-qa-5522

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