Government funding plan collapses as Trump makes new demands days before shutdown