Reverse catalog and user creation to avoid catalog 'NoneType' object has no attribute 'has_service_catalog' issue