Merge "Remove CONF.volume_feature_enabled.bootable"