Merge "Add service names for priority configuration"

diff --cc vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
index 0e6bab16d52b62d33d1e52541bc3d1c38666937f,d91e6ea93d83b5fa371a837c08f3e73a0b8ccf7d..a21170a253297f37216dfe1b4ca18c3f94cf2deb
--- 1/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
--- 2/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
+++ b/vpnservice/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java
@@@ -25,9 -25,9 +25,10 @@@ import org.opendaylight.genius.mdsaluti
  import org.opendaylight.genius.mdsalutil.NxMatchFieldType;
  import org.opendaylight.genius.mdsalutil.NxMatchInfo;
  import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
+ import org.opendaylight.genius.utils.ServiceIndex;
  import org.opendaylight.netvirt.aclservice.api.AclServiceManager.Action;
  import org.opendaylight.netvirt.aclservice.utils.AclConstants;
 +import org.opendaylight.netvirt.aclservice.utils.AclDataUtil;
  import org.opendaylight.netvirt.aclservice.utils.AclServiceOFFlowBuilder;
  import org.opendaylight.netvirt.aclservice.utils.AclServiceUtils;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl;

diff --cc vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
Simple merge