Merging Public Diagnostics and GenerateVpnClientPackage operations into master from dev