2 small fixes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/impl/java/io/core9/plugin/nashorn/JavascriptModuleRegistryImpl.java
Merge branch 'develop' of https://github.com/core9/module-nashorn.git into develop