Fixed SYNCOPE-541 + bugfix

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_2_X@1615906 13f79535-47bb-0310-9956-ffa450edef68
Fixing line endings

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