Move integration branch into MOOSE

This replaces PR #4104