Tarmac

Merge proposals dependent on lp://qastaging/~dpb/tarmac/fix-odd-unit-test-bug-1258248

  1. fix-odd-unit-test-bug-1258248
  2. Dependent merge proposals

lp://qastaging/~dpb/tarmac/fix-odd-unit-test-bug-1258248 has no merge proposals.