master-qa-6173-1

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