Merge branch 'dev' of lincl/ehr.config into dev

ag-admin.yml

@@ -12,6 +12,12 @@ zuul:
    adapterDataSet:
      path: /api/v1.0/adapter/plan/adapterDataSet
      serviceId: svr-adaption
    saveDataSetRelationships:
      path: /api/v1.0/std/documents/data_set_relationships
      serviceId: svr-standard
    uploadTemplateFile:
          path: /api/v1.0/templates/{id}/content
          serviceId: svr-health-profile
hystrix:
  command: