Update 3.6.x branch
updated package.json
CB-7455 add bundledDependencies
updated package.json version
fix merge issue, package modified
updated release notes

(cherry picked from commit be3e065cc1e8bfc92dfd9151e9bfb034307977f0)
CB-7383 Bump version to 3.6.1
merged master in
move node_modules up same level as package.json
merge fixs for node_modules
cleanup ignores and add missing windows cmd files, if you want to add a bundledDependency node_module use -f