AMF WIP
Merge branch 's7' of github.com:OpenClovis/SAFplus-Availability-Scalability-Platform into s7
AMF wip