Make queue2civicrm_import accept messages in many formats

Change-Id: I04dd2f3b1d1f0771584769589f0e60f3cacb79e0
TODO: this is stupid.  Consolidate this structural normalization.