Fix adoption and paternity adoption calculator bug

- Fixed missing date variables in question flows which move from adoption into paternity adoption.
- Removed erroneous overwriting of variable from adoption flow.