Merge "Policy Executor: handle errors, part 2 (fighting between IntelliJ and Checkstyle best practices)"