Merge branch 'release/7.x-0.4+dbc.1' into develop
US1083: Disable failing tests
updated to version 7.x-0.4+dbc.2
Merge branch 'release/7.x-0.4+dbc.2'