BZ-12931 updated formatting on note for empty acct
Merge branch 'competitive-estimates' into integration