a2960b0667
Signed-off-by: lpete@vmware.com <lpete@vmware.com> fix issues with merge Signed-off-by: lpete@vmware.com <lpete@vmware.com>