Merge pull request #737 from shenrie/master

Simplified Service Gateway parameter handling
Remove old IA alarms test.
Removed unnecesary extended resource modifications
Bumped pyon