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