Amend sql to combine tbl_centre and unit tables
Merge pull request #1 from robworth/feature/amend-combine-centre-unit-sql

Amend sql to combine tbl_centre and unit tables
add back in the missing stuff from the previous version of the script to complete it.
typo
Replace the chi number with the nhs no and a type enum.
throw an exception to kill the test if we are using the wrong profile/environment
Merge remote-tracking branch 'origin/release' into develop

Conflicts:
	src/main/resources/sql/features/7/7.sql