GEOT-4497, remove use of proprietary com.sun package classes