Guarding against NullPointerException
Added a hook to be able to synchronize configuration updates.
Merge branch 'master' into spring300
Relled back waitUntilItIsSafe() method.
Merge branch 'master' into spring300