Revert part of #2512, shot in the dark that it will fix integration tests
Add old and new Status/DesiredState labels to podToSelectableFields to fix watches