fix imports for #175 catalog persistence
don't sweat it too much if shutdown fails when node is already shutdown (fixes failing unit test BrooklynNodeTest)
tweak more things in brooklyn node