Merge pull request #1034 from shenrie/master

Increased timeouts for AS tests
Bumped ion-defs
Bumped pyon
Fixing validation errors with Negotiation objects