master-qa-5515

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