Merge "Make *-apex-info-list.xml readable by shell"