70 x fix for884

Pull request #884 plus (temporary) fix in the PAT b-tagging integration test to make it run again.