ISPN-5048 Clean up uberjars to remove javax.* classes and relocated imported classes which don't affect API