Don't remove master_candidate flag from merged nodes
Don't remove master_candidate flag from merged nodes

Prevents lots of spurious warnings like:
2011-02-10 17:00:22,776: CRITICAL Configuration data is not consistent:
Not enough master candidates: actual 3, target 4

Signed-off-by: Stephen Shirley <f872caad177d67bbe18c119d0505f2d3caa02af3@google.com>
Reviewed-by: Iustin Pop <acf83a5274f31a43af6b914614365999469c1a31@google.com>

mbakke/ganeti,apyrgio/ganeti,mbakke/ganeti,andir/ganeti,apyrgio/snf-ganeti,andir/ganeti,ganeti/ganeti,leshchevds/ganeti,bitemyapp/ganeti,yiannist/ganeti,ganeti/ganeti,yiannist/ganeti,yiannist/ganeti,onponomarev/ganeti,mbakke/ganeti,ganeti-github-testing/ganeti-test-1,bitemyapp/ganeti,ganeti/ganeti,dimara/ganeti,ganeti-github-testing/ganeti-test-1,apyrgio/snf-ganeti,andir/ganeti,grnet/snf-ganeti,leshchevds/ganeti,dimara/ganeti,leshchevds/ganeti,grnet/snf-ganeti,onponomarev/ganeti,apyrgio/ganeti