Add boxcar 2 support. closes #2886
Merge branch 'refs/heads/develop' into nosql