temprevert : Move contrib directory to base test directory

Temporarily reverting a neutron commit while we figure out a permanent
solution.

Change-Id: Ic2ba912ae0c5b1cd18b52db138131ab4f38548ad