Swap upgrade order
Move ACL logic out of forum
4.1.0-rc2