Merge "Use maven 3.6 for CPS project"