Fixes for swift testing

Some fixes for chef-jenkins, getting closer with swift-lite end-to-end testing.