(FR #1282) Include source metadata in queue messages

Change-Id: Icac0c6e8e1d008d9b6d086b23292080b740b4146