"repo" is now a public blobs repo, add "private-repo" for the private one.
Merge remote-tracking branch 'origin/master' into trusty

Conflicts:
	ltsp-build-client/puppet/ltsp/packages/manifests/opinsys.pp