Merge "Replace infobox usages and extend successbox, warningbox and errorbox"