Merge branch 'release/7.x-0.15' into develop
test cleanup: comment out failing tests
include neccesary file in unit test
updated to version 7.x-0.16
Merge branch 'release/7.x-0.16'