Query: Implement import query UI and API changes
Merge branch 'plus-trunk' of https://github.com/NCIP/catissue-core into plus-trunk