[EnMasse] breaking changes merged

[Gordon Sim]

I have just merged the new-address-model branch on to master. The build 
is green (all system tests are passing) and the system should be working 
as before.

However, this change involved some breaking API changes between 
components within the system. Indeed the API exposed by 
address-controller has also changed for anyone using that directly.

If you are running off master, be sure to pull down the latest changes 
when deploying to ensure the templates are in sync with the latest images.