Story 49233287: Fixed default risks tree to use risk template instead of base_objects teamplate for risks.
Merge remote-tracking branch 'origin/develop' into develop