Merge "Add ConfigurationHelper to the support lib" into nyc-dev