Eliminate some Warning during compilation
change back order of import statements
Revert elimination of STATISTICS_ENABLED.resolveModelAttribute
Merge pull request #6610 from langfr/EliminateWarnings

Eliminate some Warnings during compilation