addshard5.js fails due to adding the same mongod to a sharded cluster with a different shard name

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 assert: command failed: {

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 	"cause" : {

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 		"cause" : {

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 			"ok" : 0,

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 			"errmsg" : "remote client 10.97.144.222:37212 tried to initialize this host as shard shard0001, but shard name was previously initialized as shard0002",

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 			"code" : 23

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 		},

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 		"ok" : 0,

[js_test:addshard5] 2015-11-12T18:13:25.335+0000 		"errmsg" : "moveChunk failed to engage TO-shard in the data transfer:  :: caused by :: remote client 10.97.144.222:37212 tried to initialize this host as shard shard0001, but shard name was previously initialized as shard0002",

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 		"code" : 23

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 	},

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 	"code" : 23,

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 	"ok" : 0,

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 	"errmsg" : "move failed"

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 } : undefined

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 _getErrorWithCode@src/mongo/shell/utils.js:23:13

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 doassert@src/mongo/shell/assert.js:13:14

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 assert.commandWorked@src/mongo/shell/assert.js:266:5

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 @jstests/sharding/addshard5.js:54:1

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 @jstests/sharding/addshard5.js:4:2

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 

[js_test:addshard5] 2015-11-12T18:13:25.336+0000 2015-11-12T18:13:25.335+0000 E QUERY    [thread1] Error: command failed: {

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 	"cause" : {

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 		"cause" : {

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 			"ok" : 0,

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 			"errmsg" : "remote client 10.97.144.222:37212 tried to initialize this host as shard shard0001, but shard name was previously initialized as shard0002",

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 			"code" : 23

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 		},

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 		"ok" : 0,

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 		"errmsg" : "moveChunk failed to engage TO-shard in the data transfer:  :: caused by :: remote client 10.97.144.222:37212 tried to initialize this host as shard shard0001, but shard name was previously initialized as shard0002",

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 		"code" : 23

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 	},

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 	"code" : 23,

[js_test:addshard5] 2015-11-12T18:13:25.337+0000 	"ok" : 0,

[js_test:addshard5] 2015-11-12T18:13:25.338+0000 	"errmsg" : "move failed"

[js_test:addshard5] 2015-11-12T18:13:25.338+0000 } : undefined :

[js_test:addshard5] 2015-11-12T18:13:25.338+0000 _getErrorWithCode@src/mongo/shell/utils.js:23:13

[js_test:addshard5] 2015-11-12T18:13:25.338+0000 doassert@src/mongo/shell/assert.js:13:14

[js_test:addshard5] 2015-11-12T18:13:25.338+0000 assert.commandWorked@src/mongo/shell/assert.js:266:5

[js_test:addshard5] 2015-11-12T18:13:25.338+0000 @jstests/sharding/addshard5.js:54:1

[js_test:addshard5] 2015-11-12T18:13:25.338+0000 @jstests/sharding/addshard5.js:4:2

[js_test:addshard5] 2015-11-12T18:13:25.338+0000