Multicast refactoring: get rid of double switch
Merge branch 'master' into multicast_refactoring
Enforced coding style
Fixed bugs in refactoring of multicast socket. dbg off.