[fix for upstream bug 1231339] fixes fatal startup error with swift proxy.

This is a fix for upstream bug 1231339 we will carry until fixed upstream. It allows the swift proxy server to start without encountering a fatal error if S3 middleware is enabled.
Merge pull request #2 from cbaesema/havana

[fix for upstream bug 1231339] fixes fatal startup error with swift prox...