Merge "Add Workspace Permission Fix Wrapper for SampleVNF"