Changes to make katello run on Ruby 2.0
Merge pull request #2676 from parthaa/2.0-changes

Changes to make katello run on Ruby 2.0
tests - adding default namespace to keep some tests from running twice

previously rake minitest:glue  and rake minitest:lib would run the tests twice
putting non-glue stuff in the default namespace prevents this
975593(username) -  Make name field validation consistent across entities, and
use the non-html validator

Removed the constraint from username_validator for < > /.Altered existing test
cases for the same.
Merge pull request #2632 from jlsherrill/default_namespace

tests - adding default namespace to keep some tests from running twice
Merge pull request #2675 from pgodhani/username

975593(username) -  Make name field validation consistent across entities, and use the non-html validator
Nutupane: fixing Angular expression === JS errors.
Nutupane: fix alignment of details panel to table header.
Merge pull request #2688 from waldenraines/fix-angular-error

Nutupane: fixing Angular expression === JS errors.
Merge pull request #2689 from waldenraines/fix-nutupane-styling

Nutupane: fix alignment of details panel to table header.
987670 - CLI: Env/org name and Label needs to have same character limit.
Creating an env/org name with more that 128 characters throws an incorrect error string.

Label will take uuid if name exceeds 128 characters else it will take name.
Merge pull request #2690 from pgodhani/name

987670 - CLI: Env/org name and Label needs to have same character limit.
Made Sys Groups index call only return 'readable' system groups
Merge pull request #2694 from parthaa/2656

Made Sys Groups index call only return 'readable' system groups
distributor-ui - fix distributor UI and version

distributor-ui - fixed disappearing environments
Merge pull request #2696 from thomasmckay/distributor-ui

distributor-ui - fix distributor UI and version
Adding support for pulp 2.2
Merge pull request #2698 from jlsherrill/pulp2.2

Adding support for pulp 2.2
Merge branch 'master' of https://github.com/Katello/katello into bastion-merge

Conflicts:
	app/assets/stylesheets/widgets/nutupane.scss
	app/views/systems/index_nutupane.html.haml
Merge pull request #2701 from waldenraines/bastion-merge

    Merge branch 'master' of https://github.com/Katello/katello into bastion-merge