Merge "Fix error formatting for copy/move/delete failures." into nyc-dev