Updated for new cap jenkins

@thbishop ... this is ready to merge