Snappy

Merge proposals dependent on lp://qastaging/~fgimenez/snappy/fix-expected-yaml-parse-error

  1. fix-expected-yaml-parse-error
  2. Dependent merge proposals

lp://qastaging/~fgimenez/snappy/fix-expected-yaml-parse-error has no merge proposals.