What are the parts that merged into the non-Canadian Joint Operations Command