Combine localrc files

Change-Id: I18cb963c4baeeeb447bcb1436521100f1372882a
Merge branch 'tools' into dt-test
Merge branch 'nova-clean' into dt-test