Refs #6421 - Turning on rubocop for the test directory
Fixes #7816 - Refactor strong_params code
Merge pull request #4721 from daviddavis/temp/20141009111753

Refs #6421 - Turning on rubocop for the test directory
Fixes #7900: Bastion pages couldn't load due to unparseable User.to_json

A change to the User model led some fields to be unparseable when
User.current.to_json is done within the layout. This reduces the fields
to only those specifically needed by the UI.
Fixes #7863 - Upgrade rubocop to 0.26.1
Merge pull request #4718 from daviddavis/temp/20141009064621

Fixes #7863 - Use same rubocop version as foreman
Merge pull request #4704 from daviddavis/temp/20141004162439

Fixes #7816 - Refactor strong_params code
Merge pull request #4733 from ehelms/fixes-7900

Fixes #7900: Bastion pages couldn't load due to unparseable User.to_json
fixes #7813 - adds arguments to activation-key functions, BZ 1110475