Init branch from voltdb2.1