Merge "[SDC] Update maven to 3.6"