Fixed namespace collision by renaming salesforce_sync.admin.inc's
_sfq_get_value() to _sfs_get_value().
Merge branch '7.x-3.0-qa' of github.com:JacksonRiver/springboard_modules into 7.x-3.0-qa