Forward ported PR 570

Change included allows model package name (directory structure) to
contain the `-` (dash) character.
Merge pull request #338 from mhitza/pr-570

Forward ported PR 570
[Generator] move clearRelatedInstancePooling
fix issue with symphony/yaml 2.1.7 change default indentation rolled back for next version
[Peer] remove doCount*, replace doCount call with Query->count()
[Peer] cleanup doCount code