Added npe check
Fixed merge conflicts
brooklyn classpath dir with yaml files and scripts