Merge "Fix doxygen errors and enable doxygen build for devel-api" into devel/master