Merged iRODS upload validation branch