[SYNCOPE-504] fix on the branch 1_1_X

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_1_X@1604839 13f79535-47bb-0310-9956-ffa450edef68
[SYNCOPE-515] fix for the branch

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_1_X@1605076 13f79535-47bb-0310-9956-ffa450edef68
[SYNCOPE-504, SYNCOPE-515] merge from the branch 1_1_X

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