Bug fix for system admin stepdef.  Other changes related to making things work on Jenkins.