MB-11407: offline upgrade issue

Change-Id: I910850be130e08b4a052e7d152736d625cee8765