fixed a unit test
Merge pull request #545 from swarbhanu/add_restart_mode

Fixes OOIION-678 (Schedule data processes with correct restart mode of abnormal)
Code supporting merge of realtime and historical datae
Merge branch 'master' of github.com:ooici/coi-services
Bumped pyon
Removed bad call to _publish_event
Less coverage collection
merge changes from master into branch
change which cols are modified per BF master plan
Fixed smoke test error in CEI
Merge branch 'master' of github.com:ooici/coi-services
Bumped pyon
Merge remote-tracking branch 'upstream/master' into CIDEVSA-455_platform_state_model
Removed redundant operations from CI-OMS interface; Fixed recently introduced bug; More verifications regarding platform network map
put oms uri aliases in separate yml file
Removes prints from ion_loader.

Removes print statements from ion_loader.py
Ion-defs bump

Fixes another paramdict-raw conflict and updates r2demo.yml with CEI
changes.
Merge pull request #546 from lukecampbell/master

Ion-defs
bumped ion defs and refactored publish_event() and publish_event_obj() of UNS
got test for publish_event_object() working'