Add upstream fix, only one missing from enterprise-2.0 branch
Add back other install_methods (template will pass in yum)

This is the start of adding back in the enterprise bits
Add back all enterprise bits, with new oso install method