Updates for https://github.com/mozilla-appmaker/appmaker/pull/1148