Fixes to compile with BOUT++ next branch#1

bendudson wants to merge 4 commits into

totork:testingtotork/hermes-2:testingfrom

bendudson:testing-boutnextbendudson/hermes-2:testing-boutnextCopy head branch name to clipboard