Make TRI_EXTRACT_SHAPE_IDENTIFIER_MARKER static inline.
Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh