Use the glob on 2.2 now as well for listing PPP serial devices.
Rather than doing auto-detection, fall back to a glob for now when listing potential PPP serial devices. This will allow us to push ticket #2433 back to 2.2 with a more proper long-term fix for the auto-detection.
Move duplicated code into a function; Include local ID on mobile tunnel key line in ipsec.secrets.