Move watch filter into storage level

Fix #2663  @smarterclayton 
>It doesn't - we did a bunch of ugly hacking around this in OpenShift a few weeks ago - @jwforres and @ironcladlou can now go and remove those ugly hacks

The root of our problem is etcd is never updated with new pod status. Has that changed somewhere recently?