[#70748514] Rubocop lint checking, and related fixes