Allow .gitkeep in the jsonfile fact cache dir
Merge pull request #9697 from quixoten/allow_gitkeep

Allow .gitkeep in the jsonfile fact cache dir
Update to newer core and extras modules
Ubuntu still having problems initializing the postgres db
Pull in doc fixes for modules