Merge "Update Octavia cert metadata"