Fixed failing tests - s9
Merge remote-tracking branch 'origin/development18' into development18

Conflicts:
	c3/test/utils/pageobjects/s7_employment/G2BeenEmployedPage.scala
US506 - Employment - cleanup