This should also check `set_by_cli?(:manifestdir)` so either --manifestdir or --manifest override it (as 3.4.x permits).  Or perhaps `set_by_cli?` should somehow be aware that manifest is derived from manifestdir and return true here.