Modified the FAQ slightly based on the new navigation bar in response to an MLQ (redmine #11364)
Added hard returns and removed comments to add hard returns.
Merge remote-tracking branch upstream/$:{upbranch}