use marketplace-core-modules over commonplace (bug 1094263)