Get merged tree into an installalble state.

I have only tested the all, rpms and *clean targets directly.
install may work but the rpm moves a lot of things around for us.

The Apache configuration file isn't in its final state but it works
with the new mod_python configuration.

ipaserver/install/dsinstance.py

@@ -35,7 +35,7 @@ import service
 import installutils
 import certs
 import ipaldap, ldap
-from ipaserver import ldapupdate
+from ipaserver.install import ldapupdate
 
 SERVER_ROOT_64 = "/usr/lib64/dirsrv"
 SERVER_ROOT_32 = "/usr/lib/dirsrv"

ipaserver/install/ldapupdate.py

@@ -25,7 +25,7 @@
 UPDATES_DIR="/usr/share/ipa/updates/"
 
 import sys
-from ipaserver import ipaldap, installutils
+from ipaserver.install import ipaldap, installutils
 from ipa import entity, ipaerror, ipautil
 import ldap
 import logging

ipaserver/mod_python_xmlrpc.py

@@ -46,7 +46,6 @@ try:
 except ImportError:
     pass
 
-
 # Global list of available functions
 gfunctions = {}