Yesterday the Senate adopted the House amendment to S 1356, the National Defense Authorization Act 2016 by a decidedly bipartisan vote of 91 to 3. This bill was passed last Thursday in the House by a similar vote of 370 to 58. The funding provisions of this bill were in accordance with the recent budget agreement, so there has been no threat of veto of this bill.
As best as I can tell the non-funding provisions of this bill are the same as HR 1735 that was vetoed by the President. It certainly has the same cybersecurity related provisions.
BTW: There is not yet an official copy of the House version of this bill. The only thing currently available is the final draft version that had been circulated in the House prior to the vote last week.