Merge "New error status for "destination file already exists"." into gingerbread