Re-add submodules broken by the last merge
Update keepalived