fix(coreos-base/*init): Retry conflict fix from e8403520

Too many in-flight things meant the fix didn't fix things. Re-bump.