upgrading to spring security 3.2, other maven upgrades, cleanup work