Fix flow error with Q11 -> Q16

Was causing an interpolation error, Q11 was taking user to the outcome
rather than to Q16, and then the outcome, so the expected state variable
didn't exist. Fix and write test.
Merge remote branch 'origin/childcare_v2'