Update submodules including upstream*2 update to archversion syntax