LRDOCS-720 6.1.x

These changes from Jesse and me are ready for 6.1.x.