[Openstack-stable-maint] backport https://bugs.launchpad.net/nova/+bug/1195139?

Hi Folks - i’d like to back port this but to havana (and even grizzly if possible). This blocks postgres support. Is this ok to do? Thanks https://bugs.launchpad.net/nova/+bug/1195139 Tracy