Merge pull request #912 from lukecampbell/backout

Revert "Bump ion-functions (Adds QC functions and scipy)"
Merge pull request #909 from swarbhanu/build2_fix_extended_attributes

Fixes extended data process definition object and this fixes the failing test in pycc buildbot
Merge branch 'test_coverage_type' of https://github.com/tgiguere/coi-services

Conflicts:
	ion/services/dm/test/test_dm_end_2_end.py
Merge pull request #911 from carueda/platform_agent_R2C4

aggregation status now handled using a "push" approach
Updated OOI preload to one level site model
Merge branch 'ooiload'
Reset correct submodule pointers
Enabled data product source association in DataProductLink preload
Added find_site_data_products to observatory MS
Adds test for testing pydap types (still needs improvement)
Fixes coi_pycc tests

XN and XP cleanup crashes subsequent tests and possibly exchange
management, I removed it in favor of using addCleanup and letting the
exchange management to cleanup resources appropriately in lieu of
explicit cleanup which violates the workflow (and crashes).
Merge pull request #914 from lukecampbell/test_fix

Fixes coi_pycc tests
Fixes discovery

raw_query in elasticpy is a static method and requires host and port to
be explicitly specified, which is why these two tests fail.
Merge pull request #913 from lukecampbell/pydap

Adds test for testing pydap types
Merge pull request #915 from lukecampbell/discovery_fix

Fixes discovery
Merge pull request #891 from lukecampbell/validate_unit

Adds unit validation pending udunitspy
Adds udunitspy to setup.py
Revert "Merge pull request #891 from lukecampbell/validate_unit"

This reverts commit 07682c121bb2ec9eb511d8abde1e07a75c02d183, reversing
changes made to a14ee948b867ee42df6cad117a79812b3c4e9a81.
Revert "Adds udunitspy to setup.py"

This reverts commit 0da6e3be9427c33450214861c14e470658cff1b8.
Merge pull request #916 from lukecampbell/reverts

Reverts