Merge "includes/htmlform/: Use Config instead of globals"