Merge "Make Minerva skin opt out of parsoid style module"