Point Azkaban H2 to external directory. Update Azkaban stats dir.
Resolve merge conflicts and update paths.