fix failing system tests
skipped batch scheduler test
Merge pull request #386 from rackerlabs/fix-system-tests

Fix system tests (ready for review)