Merge pull request #2667 from ehelms/bastion-rpm

Bastion: Updating spec file to include bastion files.
914820-locale - correctly get current user and use .po files
Merge pull request #2672 from thomasmckay/914820-locale

914820-locale - correctly get current user and use .po files
Merge pull request #2669 from thomasmckay/system-crosslink

system-crosslink - host and guest systems now pulled from katello db

The problem with linking to a system not in the first page of results is common to many of the other crosslink items; this will be fixed in separate pull-request.
Capping rails version since 3.2.14 doesn't work

When running our code with Rails 3.2.14, we get errors such as the one below.
We're doing Provider.joins(:provider) which I'm guessing no longer works with
Rails.

    ActiveRecord::ConfigurationError:
       Association named 'provider' was not found on Provider; perhaps you misspelled it?
     # ./app/models/authorization/product.rb:22:in `block (2 levels) in
     # <module:Product>'
     # ./app/models/authorization/repository.rb:43:in `content_readable'
     # ./app/models/authorization/repository.rb:36:in
     # `libraries_content_readable'
     # ./app/controllers/content_search_controller.rb:577:in `process_repos'
     # ./app/controllers/content_search_controller.rb:100:in `packages'
     # ./app/lib/util/thread_session.rb:104:in `thread_locals'
     # ./spec/controllers/content_search_controller_spec.rb:81:in `block (6
     # levels) in <top (required)>'
Merge pull request #2629 from komidore64/org-healer-magic

org auto-attach - auto-attach available subscriptions to all systems in an org
Merge pull request #2673 from daviddavis/temp/1374670807

Setting Rails version
Fixing in_product scope to accept a product or id/ids
Merge pull request #2678 from daviddavis/temp/1374693035

Fixing in_product scope to accept a product or id/ids
Add a per system run autoheal button

Added a button on Subscriptions Pane of Systems Page to attach
subscriptions to a single system.
Changes to make katello run on Ruby 2.0
987909 - Org names rendered as HTML

making sure ORG name is escaped if it has HTML characters in its name.

this includes changes to jeditable's default text.content function and a
quick substitution of characters in displayed notices
Bastion: prevent autoloading too many results, fixes #2636.
Merge remote-tracking branch 'upstream/master' into puppet

Conflicts:
	app/models/glue/pulp/repo.rb
Fixed broken repo controller test
Merge pull request #2681 from daviddavis/puppet-merge

Merging in master to the puppet branch
actkeys-filter - properly filter available subscriptions

1. Show Red Hat subscriptions w/ no provided products
2. Show Red Hat subscriptions w/ promoted content in the CV
3. Show custom subscriptions w/ promoted content in the CV

actkeys-filter - comment out spec test
Merge pull request #2682 from thomasmckay/actkeys-filter

actkeys-filter - properly filter available subscriptions
Merge pull request #2680 from komidore64/org-html

987909 - Org names rendered as HTML
Merge pull request #2671 from pgodhani/heal_single_system

Add a per system run autoheal button