Merge branch 'release-16.1' into develop
privilege manually entered metadata for items with hasVersion (7561)
Incremented version to 17.0
Merge branch 'release-17.0'