Upgrade/Update rubocop

Now that almost all of the rubocop blueprints have been completed, make
one final pass through all of the cookbooks ensuring they're all in
sync with each other.

- Upgrade rubocop to 0.18.1
- Fix violations caused by 0.18.1 upgrade
- Add Includes for non-existent folders to Includes so they
  automatically cover future additions

Change-Id: Ib3220a0ab8281bc0eafaf9898c233d90490cfde6
Implements: blueprint lint-and-unit-testing-for-havana
Merge "Upgrade/Update rubocop"