Upgrade path 3 6

Make sure the upgrade path works also when using the Enterprise plugin.