add unit tests for platform attribute grouping according to similar
monitoring rate, and aggregation of attribute values for purposes of creation
 of granule
merge upstream/master
Merge pull request #747 from ifreecarve/2013-03-21_fix_policy_typo

reordering the delete ops to prevent policy mixup
skip pending alerts update
Merge branch 'master' of github.com:ooici/coi-services
use ThreadSafeFSM and other common elements that are now located in pyon.agent.instrument_fsm and pyon.agent.common
Merge pull request #746 from carueda/platform_multi_param_granule

forgot to add related unit tests -- no changes in code
Merge pull request #748 from carueda/platform_use_ThreadSafeFSM

use ThreadSafeFSM
bumped pyon
bumped ion-defs
Added support for optional_args for get_resource_extension in RR
Merge pull request #749 from shenrie/master

Added support for optional_args for get_resource_extension in RR
Added late data alerts and tests.
bumped pyon
bumped ion-defs
Fix to include ComputedAtrributes for all extended resources
Fixes for extended Marine Facility
Fixes for extended UserInfo
Merge pull request #750 from shenrie/master

Fixes for Marine Facility, UserInfo and generic extended resources
Fix SMOKE test