Merge "Unlink an old file before moving the new file over it" into jb-mr1-dev

                outputStream.flush();

                outputStream.close();

                final File finalFile = new File(finalFileName);

                finalFile.delete();

                if (!outputFile.renameTo(finalFile)) {

                    throw new IOException("Can't move the file to its final name");

                }