Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Also cleaned up additional patches. Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>