Dependency upgrades

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_2_X@1618614 13f79535-47bb-0310-9956-ffa450edef68
Merge from 1_2_X

git-svn-id: https://svn.apache.org/repos/asf/syncope/trunk@1618615 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk