Manually merge vpn.inc from master since cherry-picking is very messy to perform.
Correct dashboard with new ipsec generation