Patch six pacakge for jenkins module.

Also Fixing the format on the defaults.yaml because the jenkins-job creation was failling regarding this.

Change-Id: I3ee3cbfe5f8bfcfdc0ceb13ed3e14c88c768634a