Setting cdh-{os} job non-voting and fixing small bugs

Change-Id: I780abfccc12718b1b652a1db124081190c72df24