Corrects panics on MacOS Sierra
Corrects panics on MacOS Sierra

Addresses lp:1633495.

The code was already in place, we just weren't utilizing the correct commits.

frankban/juju,anastasiamac/juju,alesstimec/juju,gabriel-samfira/juju,mikemccracken/juju,mikemccracken/juju,alesstimec/juju,AdamIsrael/juju,reedobrien/juju,alesstimec/juju,frankban/juju,AdamIsrael/juju,mikemccracken/juju,marcmolla/juju,alesstimec/juju,howbazaar/juju,anastasiamac/juju,howbazaar/juju,gabriel-samfira/juju,macgreagoir/juju,bac/juju,mjs/juju,mikemccracken/juju,gabriel-samfira/juju,waigani/juju,bac/juju,marcmolla/juju,ericsnowcurrently/juju,waigani/juju,mikemccracken/juju,bac/juju,mjs/juju,alesstimec/juju,mjs/juju,bac/juju,mjs/juju,macgreagoir/juju,macgreagoir/juju,howbazaar/juju,AdamIsrael/juju,howbazaar/juju,ericsnowcurrently/juju,waigani/juju,ericsnowcurrently/juju,frankban/juju,reedobrien/juju,reedobrien/juju,waigani/juju,howbazaar/juju,anastasiamac/juju,reedobrien/juju,mjs/juju,gabriel-samfira/juju,marcmolla/juju,macgreagoir/juju,gabriel-samfira/juju,anastasiamac/juju,mjs/juju,marcmolla/juju,frankban/juju,bac/juju,macgreagoir/juju,AdamIsrael/juju,ericsnowcurrently/juju,reedobrien/juju,mjs/juju,anastasiamac/juju,ericsnowcurrently/juju,marcmolla/juju,frankban/juju