Merge "Skip get_server_diagnostics test until bug 1240043 is fixed"