* master:
  Fix pipeline icon in contextual nav for projects
  fixed up specs
  trying to fix tests
  fix merge conflicts
  css fixes
  try and fix some tests
  34060 Simply general project settings to use expanded panels