Merge branch 'develop' into features/vanilla-cmake

and fix conflicts due to renaming RAJA macro variables

Conflicts:
	include/RAJA/RAJA.hxx
	include/RAJA/exec-cilk/forall_cilk.hxx
	include/RAJA/exec-cilk/raja_cilk.hxx
	include/RAJA/exec-cilk/reduce_cilk.hxx
	include/RAJA/exec-cuda/forallN_cuda.hxx
	include/RAJA/exec-cuda/forall_cuda.hxx
	include/RAJA/exec-cuda/raja_cuda.hxx
	include/RAJA/exec-cuda/raja_cudaerrchk.hxx
	include/RAJA/exec-cuda/reduce_cuda.hxx
	include/RAJA/exec-openmp/forallN_openmp.hxx
	include/RAJA/exec-openmp/forall_openmp.hxx
	include/RAJA/exec-openmp/raja_openmp.hxx
	include/RAJA/exec-openmp/reduce_openmp.hxx
	src/ListSegment.cxx
	src/MemUtils_CUDA.cxx