master-qa-6048

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