Merge "Move package-wide flags out of parseApplication" into jb-dev