Pulling in necessary changes to get Jazzcat working on mobify-client/mobify1.1