Removed trove from import order since we don't use it anymore.
Removing some static data in two packets.
Reported by @NosBit
Made it possible to build with older ant version.
Suggested By: @jurchiks
Reviewed By: @UnAfraid, @sdw-
Merge remote-tracking branch 'remotes/upstream/master'