Gujjars, govt strike a deal