Port all remaining self.protected_instance_variables to class methods
Merge pull request #12062 from strzalek/default-protected-vars

Port all remaining self.protected_instance_variables to class methods