Source from V1R2M2 from https://repo.anl-external.org/repos/bgq-driver/V1R2M2/bgq-V1R2M2.tar.gz
Merge branch 'V1R2M2' into devel

Conflicts:
	ramdisk/src/services/common/Cioslog.cc