Merged Spring Security integration work (work in progress)