Extracted spring context support from OB trunk, and bump spring version