master-qa-6817

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