Only show discrepancies on wage details if present
Look in the form for data in preference to the session
Merge branch 'master' into UXChanges

Conflicts:
	redundancy_payments_alpha/feature_tests/discrepancies.feature