DEM-42 committing changes from docker/jira-test