Load included modules when modules_dir=None
armonic-cli fixes