Merge pull request rancher#2141 from superseb/equal_headers

Equal header font size for each log option

bump

capital

Merge pull request rancher#2051 from loganhz/canal

Revert "Change default networking to flannel"

Expect 1.6-dev branch

Merge pull request rancher#2045 from westlywright/2.0.6

missing globalStore error

Merge pull request rancher#2044 from n313893254/issue

ElasticSearch logging - 422 Unprocessable Entity when saving logging configuration

Merge pull request rancher#2039 from superseb/misc_typos

Misc typos

Merge pull request rancher#2037 from westlywright/205bugs

205bugs

Bump