Merge "JUnit test for policy/engine PolicyEngineAPI"