Fix up glassfish testing for multiple servers
Remove postgresql from host if it is not a dbserver (interferes with tests that use a context data source)