[SYNCOPE-565] Applying provided patch

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

git-svn-id: https://svn.apache.org/repos/asf/syncope/trunk@1631740 13f79535-47bb-0310-9956-ffa450edef68