UPSTREAM: meta_test should not depend on runtime.TypeMeta

cherry-pick(github.com/GoogleCloudPlatform/kubernetes): 508724b1f8431b860f3c35607127a41e70f2f0ed
UPSTREAM: Add Labels and Annotations to MetadataAccessor

cherry-pick(github.com/GoogleCloudPlatform/kubernetes): 28f5d51a5f6975a575d0cd5157c114878deba2ed
Rename config.mergeMaps() as util.MergeInto()
Simplify code to get rid variable shadowing
bump(github.com/openshift/source-to-image): 1075509c5833e58fda33f03ce07307d7193d74f4
Fix #286: Fix Config with nil Labels

- Fix nil Label case
- Refactor Config obj.Labels to use meta.Accessor
- Remove util.MergeMap() dst auto allocation, forbid passing pointers
- Improve util.MergeMap() tests and its readability
- Re-enable AddConfigLabels test for Unknown Generic Object having Labels field
Merge pull request #496 from soltysh/bug1167191

Merged by openshift-bot
Merge pull request #508 from VojtechVitek/config_labels

Merged by openshift-bot
fix service spec camel case
Merge pull request #520 from pweil-/router-doc-update

Merged by openshift-bot
Refactoring router.go to handle errors. Improving code coverage.
- Add port forwarding from 8080 to localhost:8080 on VirtualBox
- Refactoring router.go to handle errors. Improving code coverage.
- Adding port forwarding from 80 to localhost:1080 on VirtualBox, and comments on how to test locally
- Applying refactor change to controller/test/test_router.go
- Fixing identation
- Fixing unit tests
- Merge
Merge branch 'router_controller_squashed' of github.com:akram/origin into squash