Trailing whitespace.
Allow string name override.
Merge branch 'master' of github.com:floodlight/infra