Minor changes in golden files. Refs #9033.
Resolved conflict. Refs #9033.