Merge remote-tracking branch 'mel/release/2014.12' into merge-from-release

* mel/release/2014.12:
  libvirt: fix missing $(abs_builddir)/cpu
  consolekit: use systemd_unitdir for modifications
  local.conf.sample: update CORE_IMAGE_EXTRA_INSTALL comment
  local.conf.sample: drop oprofile from CORE_IMAGE_EXTRA_INSTALL
  u-boot-qoriq: add our distro name in version string
  user_features.bbclass: also process DISTRO_FEATURES_LIBC
  mel: add ADE_TIMESTAMP to the config whitelist
Merge pull request #381 from kergoth/merge-from-release

Merge from release/2014.12
curl: 7.37.1 -> %

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
connman: 1.25 -> 1.26

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
libxkbcommon: drop, upstream has the fix

Signed-off-by: Christopher Larson <chris_larson@mentor.com>