Cleaning up after D7840

Hello all,

Today I started the process of checking in code for D7840. There are a lot of moving pieces that need to be put into the code repository before they are lost.

-Andy