Tested and fixed.  Added --force-rebuild opt.
Fix jenkins scripts.