Merge "Removed unused private variable containerAwareRegistration - please review...