master-qa-6021

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