Revert back to stock stackrc; move contrail modules to localrc