Do not delete the entire structure when just an alias is removed. bz1157388
test case and remove newline from glog statements
gofmt
Merge pull request #386 from pweil-/router-pr303-combined

Merged by openshift-bot