master-qa-6355

http://issues.liferay.com/LIFERAYQA-6355