* Api scanner backport and update of api-current.txt
* Updated api-current based on current state of release branch
* Update to most recent version of api scanner
* Fix a couple of issues with the merge and regenerate the api file with the most recent version of the scanner.
* Update changelog/release notes
