Let git ignore pydev project description files

Change-Id: Ice68ef444ae92c94a2f883a6db41359d0bcb9e71
Test that Tags get converted into nova metadata

Change-Id: Iac464174d3e9b71ce01d9d7ee05d64e790b2f398
Don't reload haproxy and use ensureRunning=true

the ensureRunning option results in cfn-hup doing a restart and the
hook does a reload. these two options result in the failed state
of haproxy.

This patch rolls the two into "reload-or-restart", which is run from
cron.

bug 1201621
Change-Id: Idb42b3915cb86c613876b67abf1c6999972e19e2
Merge "Don't reload haproxy and use ensureRunning=true"
Merge "Let git ignore pydev project description files"
Merge "Test that Tags get converted into nova metadata"
Merge remote branch 'upstream/master' into cloud-server
Uncomment assertion.