master-qa-7555

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