master-qa-7958

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