Removed hostname plugin substitution
Added versioned user-data for VAF master and slave