Fix errors in invalidator changes

This fixes a few typos and an omission in the configuration file parsing
code.
Merge fixes for reconnect_invalidate option

The branch accidentally got merged before it was fully tested.