Merge commit 'adc8eab940cf6bc1fff630b0d8b8f55c7a4af1f3' into controls_fix

Conflicts:
	application/config/procedures_sql.php
Merge branch 'controls_fix' into feature/pima_controls

Conflicts:
	application/config/procedures_sql.php
Merge remote-tracking branch 'upstream/feature/pima_controls' into feature/pima_controls
controls amendments