Issue #2361045: Remove features which is updated in panopoly
Merge branch '7.x-2.x' of github.com:phase2/oa_core into 7.x-2.x
Update conditional fields to use sensible keys