Merge "move SDN-C pre-load controller to basic control generator"