Fixing hive tests issues

- porting a change that was made in provious check-in to work with insert overwrite. it fixes an issue that occurs where the port is not specified and caused hive/test003 to fail ( launchpad#1329803)
- fix hive/test006 to point to use hive when swhive is not present

Change-Id: I65376d3954b415db79f664551b5d006bc2d03f4f