Merging changes from master Spring security oauth repo