REP-661: Converted Spring.
Merge pull request #1020 from rackerlabs/REP-661

REP-661: Converted Spring.