Issue: RELENG-4975
Change-Id: I8f25c8c91278508bf086760ef094f79b9c7f359b
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>