LPS-34537 Keep changes to ClassPathUtil
LPS-30322 Source formatting