Merge "Move glance image client and tests into v1 dirs."