lib-spring: allow inheritance of class and properties in XML definition
Merge remote-tracking branch 'base/master'