Some DRF2 work, pull a too-strong assert

Assert in H2O.putIfMatch seems too strong, pulled.
integrate w/master on DRF