Merge "rundeck variables refactoring"