Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

lawrencehj

2021-07-28 619a66f9998fa646a69903a4c22e2bbf92e2221b

 src/main/resources/application.yml

@@ -1,3 +1,3 @@
spring:
  profiles:
    active: dev
    active: local