Merge into master from pull request #2488:

Fix consistency and rest output for None/null values (https://github.com/bigswitch/bigswitchcontroller/pull/2488)

src/main/java/net/floodlightcontroller/devicemanager/web/DeviceSerializer.java

@@ -64,7 +64,10 @@ public class DeviceSerializer extends JsonSerializer<Device> {
 
         jGen.writeNumberField("lastSeen", device.getLastSeen().getTime());
         
-        jGen.writeStringField("dhcpClientName", device.getDHCPClientName());
+        String dhcpClientName = device.getDHCPClientName();
+        if (dhcpClientName != null) {
+            jGen.writeStringField("dhcpClientName", dhcpClientName);
+        }
 
         jGen.writeEndObject();
     }