machines: Create options in more reasonable way
machines: Create options in more reasonable way

Current approach was using a bit strange string manipulations and
therefore was creating strings ending with newlines even when the string
was empty, which later on cased issues when we were comparing if string
is empty.

martinpitt/cockpit,mvollmer/cockpit,mvollmer/cockpit,deryni/cockpit,deryni/cockpit,cockpituous/cockpit,garrett/cockpit,deryni/cockpit,martinpitt/cockpit,martinpitt/cockpit,martinpitt/cockpit,moraleslazaro/cockpit,deryni/cockpit,martinpitt/cockpit,cockpit-project/cockpit,moraleslazaro/cockpit,cockpit-project/cockpit,cockpituous/cockpit,cockpit-project/cockpit,garrett/cockpit,garrett/cockpit,cockpituous/cockpit,deryni/cockpit,moraleslazaro/cockpit,moraleslazaro/cockpit,mvollmer/cockpit,cockpit-project/cockpit,cockpituous/cockpit,cockpituous/cockpit,mvollmer/cockpit,garrett/cockpit,deryni/cockpit,moraleslazaro/cockpit,cockpituous/cockpit,moraleslazaro/cockpit,mvollmer/cockpit,deryni/cockpit,cockpit-project/cockpit,moraleslazaro/cockpit,garrett/cockpit