Putting the master branch in lockstep with risaacson/eucalyptus-sosreport-plugins