Added back copying of castor-query.xml and wikihelp