Merge "policy/engine jdk11 junit and compilation error fixes"