[SYNCOPE-409] Latest patch applied

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

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