Minor fixes to get the metadata rest to work
ssl needs to be false
Various fixes for unit tests
Merge remote-tracking branch 'origin/master' into dev-nmalik