Updates for changes to PyAid FileUtils mergeCopy.