Moved some test and rhs functions around to ease merge of 9.5
Moved some functions around to match 9.5
Merge branch '9.5' of https://mazina@github.com/SoarGroup/Soar.git into 9.5

Conflicts:
	Core/SoarKernel/src/production.cpp
	Core/SoarKernel/src/test.cpp