Merge "Initial changes to add task affiliation styling.  (Bug 16656169)" into lmp-dev