master-qa-6048

http://issues.liferay.com/browse/LIFERAYQA-6048

* All other branches have 1 extra commit to update the import statement.