Fixing of blocker and one minor issue.
https://sonar.onap.org/project/issues?id=org.onap.appc%3Aappc&open=AWGYEY_i8TZzbCgU6gPI&resolved=false&severities=BLOCKER
https://sonar.onap.org/project/issues?id=org.onap.appc%3Aappc&issues=AWBUkj1j-08if2a6vSyq&open=AWBUkj1j-08if2a6vSyq