Initial commit of bringing back map join hints.