Merge "Add octavia_amphora_image to mine" into release/proposed/2019.2.0