[SYNCOPE-437] Reworked the patch a bit for trunk, then applied, thanks

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