Merge "Fix the order of the parameters for htmlform-title-badnamespace"