[CLC-3133] Textbooks: Consolidate messages
[CLC-3168] QA: verify expected behavior when textbook feed is unavailable
Merge remote-tracking branch 'ets/master' into CLC-3133
CLC-2860 - CFV Testing: wrong symbol in "Due" column if DPP is past due
https://jira.media.berkeley.edu/jira/browse/CLC-2860
CLC-2820: Update bundler and use its retry option

https://jira.media.berkeley.edu/jira/browse/CLC-2820

Change in codebase
Added the --retry to bundle install --local with a value of 3.
-bundle install --local || ...
+bundle install --local --retry 3 ||  ...

DevOps changes on ets-dev. I did the following:
- Set default ruby to jruby-1.7.8
- Removed jruby-1.7.6 and all associated gemsets
- Updated bundler to version 1.5.2 for global and for all named gemsets (calcentral, calcentral_qa, chris, mike, ray, jason, christian)

Monitoring:
On ets-dev, under my plan related to this branch, using the "mike" gemset,
I uninstalled several test gems (spork, capybara, simpleconv), hoping to
see some network errors in the bamboo logs that would force the retries
to occur.

After several rebuilds, I was unable to actually see the retries in the
bamboo logs, but nothing broke either, so I'm going to send up this PR
after having checked all this with Chris.

If we start seeing network errors on future bamboo builds, we can check
the logs to see if the retries are actually being performed and reopen
this ticket, if necessary.
Merge pull request #2047 from chikoon/CLC-2820-update-bundler-for-retry-opt

CLC-2820: Update bundler and use its retry option
NO-JIRA-failing-myfinaid-travis-test

This is a revision of a MyFinAid test that was failing on Travis
https://travis-ci.org/ets-berkeley-edu/calcentral/jobs/17799842

The failing assumption was removed because
1. It wasn't really testing the myfinaid model, but rather the output
   of DatedFeed's format_date method, and
2. It failed because the Travis server's configured timezone can be,
   and is, different than the CalCentral server's configuration

The test's previous assumption
  DateTime.parse(a_dated_entry[:date][:date_time]).zone.should_not == '+00:00'
that the server's time zone configuration should not be GMT is enough to
test this scenario for now.
CS-2846 New hostname for bamboo
Merge pull request #2049 from ctweney/cs-2846

CS-2846 New hostname for bamboo
Merge pull request #2042 from haroonrasheed333/CLC-3133

[CLC-3133] Textbooks: Consolidate messages
Merge pull request #2046 from christianv/CLC-2860

CLC-2860 - CFV Testing: wrong symbol in "Due" column if DPP is past due
Merge pull request #2048 from chikoon/NO-JIRA-failing-myfinaid-travis-test

NO-JIRA-failing-myfinaid-travis-test
CS-2846 Revert bamboo hostname change
Merge pull request #2050 from ctweney/cs-2846

CS-2846 Revert bamboo hostname change
NO-JIRA-remove-trailing-spaces-from-seed-file

Removed trailing spaces that I accidentally removed when fixing CLC-3023.
I was told to do this separately.
Merge pull request #2051 from chikoon/NO-JIRA-remove-trailing-spaces-from-seed-file

NO-JIRA-remove-trailing-spaces-from-seed-file
CLC-3183 - Use the term "Webcasts" instead of "Videos" in new video feature
https://jira.media.berkeley.edu/jira/browse/CLC-3183
Merge pull request #2052 from christianv/CLC-3183

CLC-3183 - Use the term "Webcasts" instead of "Videos" in new video feat...
Add dept_desc SQL query for instructors
CLC-2978 - Implement - CFV - Print View
https://jira.media.berkeley.edu/jira/browse/CLC-2978