Merge pull request rancher#1630 from loganhz/fix

[1.6] Fix catalog question issue and Bump version

Merge pull request rancher#1611 from loganhz/region

[1.6]Region

Merge pull request rancher#1604 from vincent99/1.6-dev

Bump

Merge pull request rancher#1550 from loganhz/region

[1.6]Make region field optional

Merge pull request rancher#1542 from loganhz/shell

[1.6]Fix kubectl shell issue

Merge pull request rancher#1538 from loganhz/region

[1.6]Set weight only for region rule

Remove all .DS_Store files

Merge pull request rancher#1502 from vincent99/1.6-dev

Bump version

Merge pull request rancher#1499 from vincent99/1.6-dev

Bump version