SYNCOPE-422 and SYNCOPE-423 fixed on 1.1.X

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