Merge commit '3adf7678cdf8fa955627e096bb5c27b94adc3079' * commit '3adf7678cdf8fa955627e096bb5c27b94adc3079': Add permission test structure for private framework permissions. Add <keygen> support for VPN.