integration build of 2.1M7
updated N&N in doc bundle for 2.1M7
3 files changed