Merge with Manjaro enhancements.

Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>