PROV-810 Backport changes to master-fix for 1.4.1

We have a user who will definitely need this for the next minor
version. Both bundle- and type-level ACL have been around for a while
so there’s no reason to not have the Installer support it.
Merge branch 'master-fix' into develop

Conflicts:
	install/inc/Installer.php