Fix null setting problem

Change-Id: I20a5b4a010e9b81f3593c2fb04488aed21ec7e65
Merge branch 'common-data' into dt-test
Merge branch 'cirros-image' into dt-test
Merge branch 'update-nova' into dt-test