Framework: Fixing few things about infra/maestro clone

Change-Id: Idc7b033b81979ea1ad684985d22d0102c4885f61