Latest iRods changes from keithj