Aligning dep versions between 1_2_X and master
Updating failsafe / surefire plugin
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Merge branch '1_2_X'