changes to fix tests
Merge branch 'development' of http://rsaklfsvrgendev:8080/tfs/defaultcollection/_git/Warewolf%20Open%20Source