removed defer from user specific modules
Merge branch 'develop' of github.com:au-research/ANDS-Registry-Core into develop