merge global.properties fix

Fix azkaban/azkaban#310