Revert down to using Jingle v1 for now.

Fix some stanza setup errors to get tests passing again.