Bugfix - module name collision for injecting aspect (bp #1635) (#1639)

* Bugfix - module name collision for injecting aspect (#1635)

* Bugfix - module name collision for injecting aspect

* Fixed mechanism to avoid module name collisions

* Added comments for reviewer feedback

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 1b6bd89d

)

* Update InjectingAspect.scala

Add additional function for backwards compatibility.

Co-authored-by: Adam Izraelevitz <azidar@gmail.com>