Shortly after the 2016 legislative session goes through its opening rituals, the House and Senate will take up a statewide water-policy proposal more than two years in the making.