Ship oslc.ini config file to its proper place
Contentless merge from 5.2