Kill off usage of locals() in the filter_scheduler.

We decided we don't like this syntax, so I figured I'd clean up this
file while I was playing with it.

Change-Id: I861b9bfcb98782a2f0b46ac5bff09664a13d339c
Small whitespace tweak.

A small indentation cleanup to the filter scheduler.

Change-Id: I0dc747e483c46f7e3988f813d52f689510dd481f
Merge "Kill off usage of locals() in the filter_scheduler."
Merge "Small whitespace tweak."
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp