Vpn cfgs+uhid fixes

Change-Id: I6e14e67e9d315dd66b4068742c3344df3b1c13c7
Signed-off-by: demetris <ierokipides.dem@gmail.com>