SSP-531 Change Manifest entry namespace and use JDK API