QPID-4694: ensure that any IDs generated at startup are saved immediately, rather than waiting for the user to edit something that prompts the save to occur merged from trunk r1463917