Merge "allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access"