Set environment vars for foreman
Add another resolver form FuseSource
Merge remote-tracking branch 'origin/master' into search-ui