fix merging strategy and attributes
corrected merge strategy and attribute removal
now every chaos porcess lock the initialization pahse
for tcp port discovery
Merge branch 'development' of ssh://opensource-stash.infn.it:7999/chaos/chaosframework into development