Merge "Add missing options to minijail(1) manpage"