NMS-6813: merge Master into development docs and update release notes

Edit mvrueden:
This merge is part of issue: http://issues.opennms.org/browse/NMS-6813