Merge "Show bug_map links on user builds"