Merge "Doctor stable/gambia and opnfv-7.0.0"