FLUME-2237. Example config in User Guide to use same notation for Agent name

(Ashish Paliwal via Jarek Jarcec Cecho)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk