[SYNCOPE-509]

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

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