Adding constants back
Merge branch 'task_names' of github.com:nlake44/appscale into task_names