Merge remote-tracking branch 'upstream/master'

* upstream/master: (8 commits)
  Enable must be specified per REPOID for subscription-manager enable.
  ...

Conflicts:
	.gitignore
	Vagrantfile