Fix metric labels
Fix metric labels

Some job metrics lack base labels because a prior change has dropped the
code that merges them. This commit changes this to add the base labels
back to all our metrics.

gocardless/que,gocardless/que