Fig flocker changestate yaml 796

Fixes #796
You are right that better description of my complaint would be "this does not belong in `FigConfiguration`". But also code duplication.