Merge "Migrate parent from springboot to oparent"