Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
[SYNOPE-610][SYNCOPE-616] Fixing and improving the management of the xml and properties files inside the installer
Merge branch '1_2_X'
Merge remote-tracking branch 'upstream/master'