IAM-606 Fix MDA Generation for non singleton beans
Merge branch 'master' of ssh://stash.dev.lab:7999/iam2/tools
Merge branch 'master' of ssh://stash.dev.lab:7999/iam2/tools