Make container-engine
a build (non-global) option
#1792
+135
−75
Merged