platform agent now checks first whether a child (instrument of sub-platform) is already running before attempting to launch it. Test: TestPlatformLaunch.test_instrument_first_then_platform
merge upstream/master
Merge pull request #1065 from shenrie/master

Updated policy for R2
Merge pull request #1066 from shenrie/master

Increase test coverage for Org Management Service and fix minor bug
add assign_platform_device_to_platform_device to IMS interface
Merge branch 'master' of github.com:ooici/coi-services
Merge pull request #1058 from carueda/platform_agent_R2C4

platform agent now first checks whether a child is already running before attempting to launch it
Merge branch 'master' of github.com:ooici/coi-services
add links between parent n child platform devices
phased out StatusType, it is now DeviceStatusType
working rollups, producing strange but technically correct results.  Resolved a messy merge.
fix governance test
use latest ion-defs
Merge pull request #1067 from ifreecarve/2013-05-12_rollups

Rollups, up to and including Marine Facility
Refined OOI DataProductLink
Fix OOIION-886: ResourceIssueReportedEvent summary
Merge pull request #1068 from ifreecarve/2013-05-12_rollups

Add back 2 missing commits from previous PR
Add HA Agent policy persistence
Bump ion-definitions
Merge pull request #1069 from oldpatricka/hapolicypersistence

Expose HA Agent policy in Service instance