Move HIVE Choice Authority dependency to api so it is visible to CLI and build.xml
Merge remote-tracking branch 'upstream/atmire-hive-location-fix' into dryad-master
Merge pull request #735 from ryscher/travis-fix-for-pull-729

Travis fix for pull 729