master-qa-6413

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