Merge branch 'danielb2-issue.hapi-7.0.and.lab.upgrade'