Closing this - there is additional work required to fix the underlying issue of stale configmaps, that will be address by a new BZ against master. Whenever that is ready to go and get cherry-picked back it can pick up this commit.