fixing check style issues
improving readability
simplifying code
improving readability
Merge pull request #346 from raghavgautam/master

urgent fix
hardcoded colos removed
Merge pull request #345 from raghavgautam/cleanup

minor cleanup
Merge pull request #350 from raghavgautam/master

Revert "core-site.xml from hive-exec test interferes with configuration"
Merge pull request #349 from pisaychuk/master

hardcoded colos removed