cascade merge of Docker return code and com.fasterxml.jackson.core fixes from 2.5 into master
Created by: ens-bwalts
Requirements
- Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion;
- Review the development guidelines for eHive; remember in particular:
- Do not modify code without testing for regression.
- Provide simple unit tests to test the changes.
- If you change the database schema, please follow the instructions for schema changes in the developer guidelines.
- If you change the schema, meadow, or guest language interfaces, please follow the scheme for internal versioning in the developer guidelines.
- The PR must not fail unit testing.
Use case
Cascade merge of prs #130 and #131 into master. Note, as this PR is a step in a cascade merge, it should be merged into master, not rebased.
Description
see #130 and #131
Possible Drawbacks
see individual PRs
Testing
Have you added/modified unit tests to test the changes?
If so, do the tests pass/fail?
Have you run the entire test suite and no regression was detected?