add keystone vars to the nova upgrade

otherwise paste.ini is wrong

Change-Id: Iae325befa2232943b773e0958048ef7e5892a437
Fix null setting problem

Oslo cfg wants something after an = to set a null value.

Change-Id: I20a5b4a010e9b81f3593c2fb04488aed21ec7e65
Merge "Fix null setting problem"