OVS-1678 - More fixes to cleaned up code
OVS-1678 - More fixes to cleaned up code

tcpcloud/openvstorage,sql-analytics/openvstorage,sql-analytics/openvstorage,tcpcloud/openvstorage,sql-analytics/openvstorage,tcpcloud/openvstorage,sql-analytics/openvstorage,tcpcloud/openvstorage