Core: apply FAM blocking option to all commands that start a server
Core: Gracefully handle failure to add client without default group
Metadata: fixed long line
Copy xml elements before appending to tree.  This prevents modified entries from being added
Merge remote branch 'upstream/maint' into maint