MDL-70229 install: Changes to continue working with parallel branches