Clarify ContainerSupport variable names since we are concatenating, and add code to get router from container, and improve controller mixin compatibility