Merge pull request #1746 from jimmidyson/master

Fix initial import stuff in hawtio-base