Origin Christmas cleaning vol.2

Motivated by https://github.com/openshift/origin/pull/518 I've done some more cleaning in our Origin repo due to the `verify-golint.sh`

Plenty of other problems are still there. Run `./hack/verify-golint.sh` and you will see. 


this was OK