[SYNCOPE-547] Merge and adapt from 1_1_X

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

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