Fixes SYNCOPE-455 on 1.1.X

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_1_X@1547766 13f79535-47bb-0310-9956-ffa450edef68
SYNCOPE-455 merge from 1.1.X

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