Bastion: fix clash between angular-gettext and ng-if.
Rubocop: Fixing error by updating gem

Fixing the error: undefined method `color' for ".":String. This was caused by a
gem requirement in rubocop and was fixed in 0.17.
rhsm-api - moving all rhsm routes to candlepin_proxies_controller

rhsm-api - clean up of method names
we should not have an openjdk package here
Merge pull request #3656 from thomasmckay/rhsm-api

rhsm-api - moving all rhsm routes to candlepin_proxies_controller
Merge pull request #3662 from waldenraines/fix-translate-error

Bastion: fix clash between angular-gettext and ng-if.
Merge pull request #3663 from daviddavis/update-rubocop

Rubocop: Updating gem to fix error
update lucene to 4 for new elasticsearch
Merge pull request #3668 from jmontleon/lucene4

update lucene to 4 for new elasticsearch
Merge pull request #3665 from jmontleon/remove-openjdk

we should not have an openjdk package here