Putting the r2.2 branch in lockstep with risaacson/eucalyptus-sosreport-plugins