MDL-3714 mod_forum: pre-integration clean up