fix hotfix serving depending on app version and hotfix version (bug 1031516)

Second attempt at fixing [bug 1031516](https://bugzilla.mozilla.org/show_bug.cgi?id=1031516)