Add code to do implicit binding of discovery and bootstrap roles.

At last, the node_role code is getting a bit of a workout.
Merge pull request #594 from VictorLowther/pull-req-master-f2dad2c18398d692a3bb26eb5af182c27059631e

Bind bootstrap and discovery roles to newly-discovered nodes by default. [1/1]
merge from upstream