[#1840] update eirods-dev.list.template to reflect new header file names
[#1840] Merge branch 'master' of github.com:irods/irods