[SYNCOPE-543]

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_1_X@1623333 13f79535-47bb-0310-9956-ffa450edef68
[SYNCOPE-543]

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

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