9.2 work

refactored

removed the extraneous test for ip_policy

redid the context tests for the new strategy

removed the skipped tests

added context strategy specifically for neutron

updated the requirements to not break jarvis

RM5862