Mataf expansion to be ‘completed before Haj’