[CDF-242]: Ensure Orient DB shuts down when BA Server shuts down
[CDF-243]: Fix for Auto includes not working in 5.0.3
Merge pull request #73 from pamval/5-trunk

CDF-242 and CDF-243