Merge "Remove non-locking accounts from the config guide"