Update to more recent nova/quantum puppet modules for Puppet 2.6

Several fixes upstream for Puppet 2.6 compatibility. There was also
a change that required the metadata agent stuff to be shuffled
around a bit.

Change-Id: Ic054839ebe2931b82a83e49ed967537a3597cec5