Merge pull request #242 from nhr/enterprise-2.0

Various bug fixes for enterprise-2.0 oo-install