Merge pull request #241 from nhr/enterprise-1.2

Various bug fixes for enterprise-1.2 oo-install