Fix novaconfig include for labs puppetmaster

Change-Id: If1d411e095e68352af6e53d0820e9a5564fc9c68
Merge "Fix novaconfig include for labs puppetmaster" into production