Merge pull request #503 from detiber/enterprise-2.2

<oo-install> backport latest oo-install changes