Cleaned up lock init/destroy in multicast demo code
Merge branch 'develop' of github.com:XIA-Project/xia-core into develop