Merge pull request #2487 from idaholab/devel

Maintaining changes between internal repo and Github repo - #2460
Merge pull request #2491 from idaholab/devel

Maintaining changes between internal repo and Github repo - #2460
Merge commit 'a121904a7c616d79710b36486fb42d3897446699'
Merge commit 'b1a97febf4471ffeb3674a25aa6566fc5e31f687'
Merge commit 'f4fbe2e52c4a7ccf6d5a0761470cb93902d71f19'
Merge commit 'bc037e447e611d65d47335f57b6fa658ed65e0f7'
Merge commit 'ee92b7413f622d7c03210a692ab324e953f0a926'
Merge commit '48c9719629a3438d795e9acebfa1a4181dbc248e'
Merge commit '26c51362150f0b647b379a32c357e661fe55bc04'
Merge branch 'master' of github.com:idaholab/moose
Merge commit '6ae01c5fe20def015a56ed598a3ad6d54a218151'
Merge commit '7230c0ba0a158a88d281ffb371e6a3f0dc71d0af'
Merge commit '004ae12d3a62cd2297da8740b4dc4b8240b44583'
Merge commit 'bba5bf98892ba3640c05f1d6ea2f87100158852e'
Merge commit '6e6408e44bb862745d49651d3cfef37ff4cbb0d4'
Merge commit '5fa9e6fbe3cb60717d2aee54b84a988c831b870a'
Merge commit 'e3b4d1f0663722ac527b14bf2b57ba8f16c3bdfc'
Merge commit 'bde568774874061b43ad544e46387bfa7215d656'
Merge commit '536bce1ca7b9256d7a424277facc76cbfcea3418'
Merge commit '4dd7c6e20920f60acf996fc8dbcf19c2ea580d18'