ECLIPSE-1079 - more cleanup of server bean loader