I have ported straight all barclamps as they have been before. I think enabling clusters should be done in a seperate pull request/commit.