Made the Broker Policy Validation Handler Java 1.6.
Also made some minor changes needed.