Merged changes from trunk

* r3354: Fixed formatting in echam6 table file
* r3351: Use unsigned for namespace counts.
* r3350: Add missing static declarations.
* r3349: Use unsigned for static variable table.
* r3348: Remove effectively unused indirection table.
* r3347: Replace array of resource handles with apply call.
* r3346: Replace list of grids with call to resh apply.
* r3345: Change return type of resource counts to unsigned.
* r3344: Merge declarations and initializations in srv_add_record.
* r3343: Prevent passing of value that might not work for exit(3).
* r3342: Save repeated calls to query function.
* r3341: Add tableID check to tableInqPar.
* r3340: Simplify control flow in tableInqParUnits.
* r3339: Simplify control flow in tableInqParLongname.
* r3338: Merge declaration and initialization.
* r3337: Simplify control flow in tableInqParCode.
* r3336: Simplify control flow in tableInqParName.
* r3335: Add missing conditional.
* r3334: Return constant file suffix string pointers.
* r3333: Add MPI flags and feature attribute to JSON description.
* r3332: Generalize BUILD_* substitutions and add substitutions for MPI.
* r3331: Allow for specification of MPI compilation/library flags.
* r3330: Structure JSON description file hierarchically.
* r3329: Update autoconf m4 macros.
* r3328: cdilib.c update