MSINM-56: Settings changed to give System properties precedence