Merge branch 'dev' into 'AFP-66-kafka-consumers'

# Conflicts:
#   src/main/java/com/nisum/ascend/inventory/service/ProductService.java

src/main/resources/application.properties

-server.port=8080
+server.port=8083
 spring.data.mongodb.uri=mongodb+srv://admin:${db.password}@inventory-promotions.d4nfz.mongodb\
   .net/${spring.data.mongodb.database}?retryWrites=true&w=majority
 spring.data.mongodb.database=products-promotions-DB
@@ -8,3 +8,4 @@ kafka.consumer.bootstrap-servers=localhost:9092
 kafka.consumer.group-id=PRODUCT
 kafka.WAREHOUSETOPIC.input=WMOS_ORDER_UPDATE
 kafka.ORDERTOPIC.input=OMS_ORDER_UPDATE
+db.password=wHXHvtngAwKVdjZl
\ No newline at end of file