master-qa-7905

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