Improve error reporting

Follow-up of upstream changes:
- cherry-pick(github.com/GoogleCloudPlatform/kubernetes):72c922668fefc1cf671d9c9e38ebf22a22a80dcf
- cherry-pick(github.com/GoogleCloudPlatform/kubernetes):397240aebe029b6ff5c64fa4f04f5524b053f115
Fix project description in example and console to work as an annotation
bump(github.com/GoogleCloudPlatform/kubernetes):3910b2d6e18759b3a9a6920c7f3d0ccd122df7f9
tweaks to handle new kubernetes, kick travis again
Merge pull request #559 from VojtechVitek/checkErr

Merged by openshift-bot
Merge pull request #562 from jwforres/fix_project_description

Merged by openshift-bot
Merge pull request #547 from deads2k/deads-rebase-kubernetes

Merged by openshift-bot
Router refactor

- Remove haproxy router implementation
- Add template-based router implementation
- Refactor router plugin interface