Also add "This file is not part of GNU Emacs." when this is the case.
The command org-reload did not only reload any loaded files, but all lisp files in the Org distribution. Also, it actually never reloaded any files from the contrib directory. Both of these problems are now fixed.