Fix core/module/const_added_spec.rb and resolve merge conflicts betwe… #1966

Job	Run time
specs (ubuntu, 3.2.7)	1m 29s
specs (ubuntu, 3.3.7)	1m 28s
specs (ubuntu, 3.4.2)	1m 32s
specs (macos, 3.2.7)	1m 7s
RuboCop	51s
specs (macos, 3.3.7)	1m 9s
specs (macos, 3.4.2)	1m 15s
specs (windows, 3.2.7)	4m 55s
specs (windows, 3.3.7)	4m 56s
specs (windows, 3.4.2)	4m 51s
specs (ubuntu, 3.4.2, --enable-frozen-string-literal)	1m 31s
	25m 4s

Provide feedback