Merge pull request #395 from rdsubhas/master

1565,1630 | Subhas | Fix CI build failures
1287 | Subhas | Fix cron wildcard error