Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (cherry picked from commit 3080033a8c4db64199b03b6058e18488f619088c)