merge of obanyc-2145 to branch
fixing typo in pom for obanyc-2145
another integration test for obanyc-2145
Preventing nullpointering related to obanyc-2145