code update
Merge branch 's7' of https://github.com/OpenClovis/SAFplus-Availability-Scalability-Platform into s7