Issue #2183323 - Remove all remnants of $GLOBALS['conf']