[575012] Merge of Preference custom.template overwrites existing user templates https://bugs.eclipse.org/bugs/show_bug.cgi?id=575012