Merge "Fix octavia manager installation"