Added NaN->Null adapter

Change-Id: I1a70f269ab69faa3ca10fc08dd84b68331835916
Merge branch 'master' into aws