* We can't use machine overrides in layer.conf because MACHINE is not
  defined yet (local.conf has not yet been parsed) so remove these
* In light of the above having a separate collection configured for
  crownbay-noemgd no longer does anything, so remove it as well.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>