LRDOCS-463 6.1.x

This is ready for upstream/6.1.x. Thanks.

@jrao