While at it, also do the following fixes - Drop the URL pointing to the old github repo - Fix detection of default set of private keys Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>