LRDOCS-720 on 6.2

These changes from Jesse and me are ready for trunk. Thanks.