Merge "Added support for persistance of service references to netconf."