[ContentBundle,WebBundle] Fix some standard coding for PR 1962