Merge branch 'dev/icssNCD' into dev/KLBstand

# Conflicts:
#	aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java