Merge "Query users excluding any being removed" into jb-mr1-dev