Remove (almost) all traces of webapp, WEBAPP, MARKETPLACE (bug 974850)