master-qa-7314

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