Merge "Update version for vcpe vpp vnfs to Amsterdam" into amsterdam