The issues had been among the sticking points for coming to an agreement on a $15 billion spending plan for the six-member conference committee.