rz cylindrical gap conductance order of operation
also removed warnings that were causing trouble
fixes #3199
Merge pull request #3200 from novasr/update_3199

rz cylindrical gap conductance order of operation fixes #3199