catching Timout exceptions and removed commented code
Fixed merge issues
Bump ion def to include new dev es server
Added logic to check if stream definition exists localy before retrieving it from pubsub
Merge branch 'master' of github.com:ooici/coi-services
Update visualization transform to remove messaging call during granule processing
Fix merge conflict
Merge pull request #992 from shenrie/master

Update visualization transform to remove messaging call during granule processing
Bumped ion-defs
Refactored agent policies to use XACML
Merge pull request #993 from shenrie/master

Refactored agent policies to use XACML
Fixed typo in merge resolution of transform
Merge branch 'master' into refactor_managedendpoint