Merge "SDC maven version to 3.6"