Update code to bennu-json api changes; include compilation of bennu-portal in Make