Merge F23 changes from main into edition along with some git cleanup

[mitchkeller]

This is ready to merge @mattboelkins. And then you should be able to follow the instructions to rebuild both versions on A2Hosting (or we can do that this afternoon if we get a chance before I have to go to my other meeting).