[SYNCOPE-313] Resolving IT conflicts

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