Merge pull request #715 from nascs/refactor_rock4_series #1953

Job	Run time
test (commit)	2m 43s
test-optional (gitown, manual)	1m 29s
build	5m 52s
test (push)	1m 49s
test-optional (check-external-links, manual)	2m 57s
deploy	1m 47s
	16m 37s

Provide feedback