Consolidate nfstestldapserver onto the nfstestserver instance

- to eliminate the extra VM

[#163926900](https://www.pivotaltracker.com/story/show/163926900)

Author: davewalter

operations/test/enable-nfs-test-ldapserver.yml

@@ -1,36 +1,29 @@
 - type: replace
-  path: /instance_groups/-
+  path: /instance_groups/name=nfstestserver/jobs/-
   value:
     name: nfstestldapserver
-    azs: [z1]
-    instances: 1
-    stemcell: default
-    vm_type: small
-    networks: [ name: default ]
-    jobs:
-    - name: nfstestldapserver
-      release: nfs-volume
-      properties:
-        ldap:
-          ssl:
-            active: true
-            ca_cert: ((ldap_test_server_ca.certificate))
-            server_cert: ((ldap_test_server_ssl.certificate))
-            server_key: ((ldap_test_server_ssl.private_key))
+    release: nfs-volume
+    properties:
+      ldap:
+        ssl:
+          active: true
+          ca_cert: ((ldap_test_server_ca.certificate))
+          server_cert: ((ldap_test_server_ssl.certificate))
+          server_key: ((ldap_test_server_ssl.private_key))
 
 - type: replace
   path: /addons/name=bosh-dns-aliases/jobs/name=bosh-dns-aliases/properties/aliases/domain=nfstestldapserver.service.cf.internal?
   value:
     domain: nfstestldapserver.service.cf.internal
     targets:
     - query: '*'
-      instance_group: nfstestldapserver
+      instance_group: nfstestserver
       deployment: cf
       network: default
       domain: bosh
 
 - type: replace
-  path: /instance_groups/name=diego-cell/jobs/name=nfsv3driver/properties/nfsv3driver?/ldap_ca_cert?
+  path: /instance_groups/name=diego-cell/jobs/name=nfsv3driver/properties/nfsv3driver/ldap_ca_cert?
   value: ((ldap_test_server_ca.certificate))
 
 - type: replace