Philippe Gorley authored Nov 07, 2018 and Philippe Gorley committed Nov 07, 2018

Add duplicate number after filename, but before extension, and start
count at 1 instead of 0.

Before, it would be '(0)file.jpg', now it is 'file (1).jpg'.

Change-Id: I8bb35cfce63447cf024e5b5dfb18a0410b507ef6