Really fix canonical/non-canonical project merge

In change Icaf8fca3aa4577b009d691f9a67adcb43ea040f5 the merge of
canonical and non-canonical projects was fixed. However the fix was
not complete and only covered the static configuration workflow. The
dynamic configuration workflow is still broken.

Now really fix by canonicalize the project names in every case and
make the tenant parameter mandatory.

Change-Id: I5af74763fc9c4be395a341f28c6751d22bd46195
3 files changed