Make upstream pkgrepo an optional include
Merge branch 'issue_5'

Conflicts:
	jenkins/init.sls