master-qa-6917

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