Merge "Make HA container bundle work on remote nodes"