Fix #2206. Includes refactoring of ContainerRetryMixin into CommonContainerMixin, and rearrangement of the code to initialize HTTPClientMixin.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>