Updated cybox_2.0.1_upgradable.xml to include all optional element removal checks