Merge "Update vfc-gvnfm java yaml template"