Merge "Miscellaneous fixes"

diff --cc bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
index ab260e4,0cabcf6..9fd1634
--- 1/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
--- 2/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/UpdateAAIGenericVnf.groovy
@@@ -207,10 -207,10 +207,10 @@@ public class UpdateAAIGenericVnf extend
                        String orchestrationStatusEntry = ""
                        if (orchestrationStatus != null) {
                                // Construct payload
-                               orchestrationStatusEntry = updateGenericVnfNode(origRequest, genericVnfNode, 'orchestration-status')
+                               orchestrationStatusEntry = updateGenericVnfNode(origRequest, 'orchestration-status')
                        }
  
 -                      def payload = """
 +                      String payload = """
                                        {       ${personaModelVersionEntry}
                                                ${ipv4OamAddressEntry}
                                                ${managementV6AddressEntry}