Optimized controlled-Z gates for two superconducting qubits coupled through a resonator