Merge pull request #1064 from shenrie/master

Bumped pyon
change hasOutputProduct to hasSource in device and site extension resource
Bumped pyon
Bumped ion-defs
Updated policy for R2