Deprecated smart wastebasket.
Deprecated Maven1 support.
Deprecated resource store utils.

Only one method used in only one place, so moved it in.
Updated packaging mapper.