hammer2 - Add 'cleanup' command, retool h2 build for conf/files inclusion