Conversion of old factory config names to new one is not checking for tilde

The code in 
AbstractConfigurationEntryHandler#extractId converts an old factory configuration name into a new one (with a tilde). Unfortunately it only checks for a dash but not a tilde, which means in the case of
factory~a-b this is converted to factory~a~b instead of keeping it as factory~a-b
 
A similar bug might lurk in other places dealing with factory configurations