Merge "Update SSH key management for Octavia"