recreate commits from jira1024 branch
address test issues
Merge branch 'master' of github.com:ooici/coi-services into fix_jira1024
bump ion-defs
Merge pull request #1165 from ooici/fix_jira1024

Fix jira1024