Fix/improve coding relating to various "state"/presparam INI keys

[John Small]

FM2_Temp.*

• These keys are used when the "Quick" settings page is used to reset a configuration en masse to a pre-defined configuration.
• These keys are supposed to be created, used in a RestoreDirCnrState and then immediately deleted.
• The RestoreDirCnrState is not always being called and these keys are not always being deleted.

A default set of presparams for directory containers:

• Some of the presparams are saved using keys without a common prefix, some are saved with a prefix of DirCnr and some are saved both ways!?

The goals for this ticket:

• make sure the FM2_Temp.* keys are used and deleted correctly
• save and use default directory container presparm INI keys in a consistent manner.