Fix up DAO to ensure there are no references to civicrm_contact and l…
Created by: seamuslee001
…ikewise for the auto_install.sql file and ensure the xml matches the DAO
Created by: seamuslee001
…ikewise for the auto_install.sql file and ensure the xml matches the DAO