FLUME-2466. Embedded agent name cannot contain spaces

(Johny Rufus via Hari)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk