Update for OPENDJ-1572

Rename queries
Update for OPENDJ-1572

Remove SDK issues from server list