merge changes
Merge branch 'expire' into ship

Conflicts:
	controller.cxx
	daemon.cxx
	datapoints/catalog.cxx
	datapoints/catalog.hxx