Fixed DAOFactoryHelper, DAOChooser and DataAccessManager templates. refs #493, #507