Merge "Fix octavia service type"