1165346 - document default host name in admin.conf
Merge pull request #1380 from asmacdo/1165346

1165346 - document default host name in admin.conf
Bumps python-qpid dep to release three
Merge pull request #1383 from bmbouter/bump-python-qpid-to-release-three

Bumps python-qpid dep to release three
Merge branch '2.6-dev'