master-qa-6658

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