Merge proposals dependent on lp:~terceiro/lava-dispatcher/filter-ansi-color-codes-mwhudson-state-machine

1. filter-ansi-color-codes-mwhudson-state-machine
2. Dependent merge proposals