Import runit version 1.1.4
Import runit version 1.1.6
clean up merge conflicts