updated for Spring framework 4.0.2 libs
unify preference categories into one Spring category
STS-3734: fixed NPE by correctly using the config name while populating the internal auto-config structures
Merge branch 'master' into d3-editor