Merge "Tagging Doctor opnfv-6.0.0"