update test to be python 2.6 compatible
Upgrade python-amqp to 1.4.6
Merge pull request #1409 from bmbouter/upgrade-py-amqp-to-1-4-6

Upgrade python-amqp to 1.4.6
Merge branch '2.5-testing' into 2.6-dev
Merge branch 'test-none-check' into 2.6-dev