Maven 2 & 3

Revert temporary changes to scp wagon handling