Merge "Fix for restart fails in the installFoundationInfraOnTarget function"