Some fixes from getting harq-http running
Merge branch 'better_durable'

Conflicts:
	src/wire.pb.cpp