dashboard update, remove state bug fixes
Merge pull request #298 from amit-git/2.x

dashboard update, remove state bug fixes
Merge pull request #299 from tbak/2.x

2.x replication refactoring