Minor updates to error message
Merge branch '1.0.7' of github.com:DeegC/zeidon-joe into 1.0.7
Merge branch '1.0.7' of github.com:DeegC/zeidon-joe into 1.0.7
Update some apache dependencies to match Enservio