Add boxcar 2 support. closes #2886
Merge remote-tracking branch 'upstream/develop' into develop