New plugin map for Ohai::System controller. Added and updated spec tests to reflect changes.
Merge branch 'tn/ohai-int-test' into OHAI-9015