Merge "v.io/jiri/profiles: significant refactoring of profiles package:"