Merge "Spring Boot Actuator enabled on /manage" into cps_poc