Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.
This commit merges below servers functional tests.
- test_server_diagnostics
- test_server_external_events
In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.
Change-Id: I6a078e8dcbdd0160c6efb6dbac327ebc1f90fe1a
ghanshyam
2cf7b6ff95