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