master-qa-6808

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