Merging master pre-runcible-1.0.0 into puppet

Conflicts:
  app/models/glue/pulp/repo.rb