Updated max entities to 1000
Merge pull request #334 from rackerlabs/max-entities-1000

Update max entities to 1000
changed maxentities & test fixes for jenkins jobs
Merge branch 'master' into test-fix
added waittime after webhook execution
spellcheck
Merge pull request #337 from rackerlabs/test-fix

changed maxentities & test fixes for jenkins jobs (ready for review)
Merge branch 'master' into one_group_table