branches: 1.1.2; 1.1.18;Remove individual opt_foo.h files, continue consolidating to opt_rumpkernel.h