Added npe check
Fixed merge conflicts
Merge branch 'npe' of https://github.com/dave-finnegan/brooklyn into misc
tidy of MongoDB client NPE check (as per discussion in #1327), and clearing isRunning on stop