Fixed minor issue in resource list uri. Added catch around resource list to fix issue with test cluster
Merge branch 'dev' into fix-registrations-1475