Move watch filter into storage level

Fix #2663  @smarterclayton 
The same thing happens to replication controller too, where we update its status (replica).  I've struggled a little bit, but didn't find a better alternative.  I'm also fine with it for now.