Bug 961245 sdk/self makes less assumptions about loader options
Merge pull request #1357 from jsantell/961245-remove-assumptions-from-self

Fixes Bug 961245 sdk/self makes less assumptions about loader options, r=@erikvold