Fix issues reported by sonar
https://sonar.onap.org/project/issues?id=org.onap.modeling.toscaparsers%3Achecker&resolved=false&types=BUG