Updating dependencies and maven parameter comments
Additional configuration for target c++ std
Correct handling of other options, prefix with x-  to make allowable xml tags, like x--std