I encountered a minor conflict (on the imports) when applying the patch to the stable/havana branch, I'm attaching the Havana version. I can confirm this fixes both issues in a Havana devstack, thanks.
I encountered a minor conflict (on the imports) when applying the patch to the stable/havana branch, I'm attaching the Havana version. I can confirm this fixes both issues in a Havana devstack, thanks.