Let's actually use the result of our format conversion.
Merge pull request #2405 from ey6es/master

Let's actually use the result of our format conversion.
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload