JBDS-2470 some cleanup and addition of a jpp serverbean type