meta-ibm: set OBMC_ORG_YAML_SUBDIRS in machines

The OBMC_ORG_YAML_SUBDIRS variable is intended to be set system-wide
and not via bbappends.  There was an existing 'ibm-distrovars.inc'
that was unused.  Rename it as appropriate, add it to the machines,
and remove the bbappend files.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id5acd359f41c17ec9e68d1f0717e2f5c1bf96dcf
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index c037a78..08f2935 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -15,6 +15,7 @@
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
 require conf/machine/include/p9.inc
+require conf/distro/include/ibm-yaml.inc
 
 PHOSPHOR_MRW_LICENSE = "Apache-2.0"
 PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"