Merge "Add server and client metadata for Rundeck"