Fixed some (m2e) configuration and 3rd party deprecation issues
rcs keywords test
test