fixed issue with ant.settings.template
Merge commit '6c18f3f8a1eb8048be9c634fb14cbbf0391141fe' into develop