[trunk] Improved check when a module's package is to be identified
[trunk] Improved check when a module's package is to be identified

markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation,markfinal/BuildAMation