Ottawa is preparing to make changes to its shelved border-security bill to try to get it back on track, including removing provisions that would have given the police and the country’s spy agency ...