Signed-off-by: Petre Eftime <petre.p.eftime@intel.com> Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com> Conflicts: src/upm.i
Signed-off-by: Jon Trulson <jtrulson@ics.com> Signed-off-by: Sarah Knepper <sarah.knepper@intel.com>