[SYNCOPE-340] Merge from 1_0_X + applying provided patch

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