UCBG-140: Changed Rare and Cultivated boolean fields to string fields so they can be added to advanced search
Merge branch 'ucb-deploy_2.4' into ucb-deploy_3.2
Merge branch 'ucb-deploy_3.2' into pahma_3.2