odt export version conflict on emacs for mac os x

[Skip Collins <skip.collins@gmail.com>]

The version of org that comes with my stock Emacs on OS X (from
emacsformacosx.org) seems to conflict with my git installation of org.
This is particularly evident when trying to use ODT export. Emacs.app
is located in the usual /Applications folder. The newer org, which I
intend to completely supplant the version that comes with Emacs, was
installed with prefix /usr/local/share using the 'make up2' command.
My minimal init file is:
(setq load-path (cons "/usr/local/share/emacs/site-lisp/org" load-path))

I start Emacs from the command line:
/Applications/Emacs.app/Contents/MacOS/Emacs -Q -l
~/.emacs.d/minimalinit.el ~/test.org

Doing M-x org-version yields:
Org-mode version 8.0.7 (release_8.0.7-369-g9154c7 @
/usr/local/share/emacs/site-lisp/org/)

I immediately browse the ODT customization options showing that all
variables are prefixed with org-export-odt-. In order to be able to
select ODT in the export dispatcher, I have to add odt to
org-export-backends. Curiously, it shows that it is changed outside of
customize before I make any changes. So I have to unselect odt and
reselect it and then Save for Current Session for ODT export to be
enabled. When I finally use the dispatcher to generate an ODT file,
the following happens:

1) an odt file is generated (good)

2) These Emacs messages appear (bad):
Debug (ox-odt): Searching for OpenDocument styles files...
Debug (ox-odt): Trying /usr/share/emacs/etc/org/styles/... [2 times]
Debug (ox-odt): Trying /usr/local/share/emacs/etc/styles/...
Debug (ox-odt): Trying /usr/local/share/emacs/site-lisp/org/etc/styles/...
Debug (ox-odt): Trying /Applications/Emacs.app/Contents/Resources/etc/org/...
Debug (ox-odt): Using styles under
/Applications/Emacs.app/Contents/Resources/etc/org/
Debug (ox-odt): Searching for OpenDocument schema files...
Debug (ox-odt): Trying /usr/share/emacs/etc/org/schema/... [2 times]
Debug (ox-odt): No OpenDocument schema files installed

3) I find that there are new variables with the org-odt- prefix. Many
of them seem like duplicates of the org-export-odt set (bad).

It appears that the old version of ODT export (the one bundled inside
Emacs.app) is getting loaded and ox-odt is looking in the wrong
directories for schemas and styles. Explicitly setting
org-export-backends, org-export-odt-schema-dir, and
org-export-odt-styles-file in minimalinit.el has no effect. These
variables seem to be superseded when ox-odt is invoked.

I started digging into this when I noticed some odd behavior while
using ODT export. I think I am stuck using the older, buggier ox-odt
and my setup is mixing two versions of org.

I have installed the latest release of Emacs for Mac OS X:
GNU Emacs 24.3.1 (x86_64-apple-darwin, NS apple-appkit-1038.36) of
2013-03-13 on bob.porkrind.org