Merge "Doctor Gambia opnfv-7.1.0"