Combine localrc files

Use the Grenade devstack.localrc.* files as the 'default' for DevStack
by pre-pending them to the devstack-vm-gate.sh generated localrc.

devstack.localrc is now appended to the combined DevStack localrc
to still allow it to be the final config.  Normally this will be empty.

Change-Id: I18cb963c4baeeeb447bcb1436521100f1372882a
Add verify-javelin

Change-Id: I842593e15eb294c8b2aefae54f9303708de8d67f
Merge branch 'combine-localrc' into dt-test
Merge branch 'verify-javelin' into dt-test
Merge branch 'tools' into dt-test
Merge branch 'nova-clean' into dt-test