LRDOCS-333 6.1.x - maven

These changes are ready for merging into 6.1.x. Thanks. @jrao