support persistent monitoring hints, remove expected file for OpenVPN
added fixtures
Merge branch 'master' into 2.x