Add Filtermaster and add changes to Filterserver

--HG--
extra : amend_source : 2b06ae9931cc9b5238bdfce56780e690ed9c5a1b