Merge "Move ConfigurationListener off of NSSL"