Alfred master slave

Handle alfred master/slave. This implementation rules for every mesh on the system, so it is not really multi community aware. But solves the current problem with alfred masters. 

Please be careful while reviewing, the first patch is a fixup for a not so careful merge...