Enterprise 1.2

Feature parity with installer-prompted changes in 2.0
Also, works around y-c-m bug that won't setopt on dotted repoids.