some changes to stabilise log settings
Merge branch 'development' of http://rsaklfsvrgendev:8080/tfs/defaultcollection/_git/Warewolf%20Open%20Source
Merge branch 'development' of https://github.com/Warewolf-ESB/Warewolf-ESB into HEAD