fix CatalogAware import
Updating version on trunk after tagging