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