maint(profiles): Merge usr profile back into generic target.

coreos/amd64/usr remains as an alias to coreos/amd64/generic for now.