XML update for 2.8.3.1-RC-MAIN

This is all config tweaks for a change!