Merge "Update queens config for octavia"