Bring in correct system_settings.xml

Summary: brings settings up to date

Test Plan: merge

Reviewers: synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D290