Merge "Make option for test functionality added to tool to upgrade vnf,ns descriptors to R. THREE"