merge from branch

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