Merge nicola's changes #1128 and #1092.
Remove false compialtion warning.
Hide FF proxy builder from add collection dialog.
Merge pull request #1346 from alja/addcollection53

5_3_X Hide FullFramework proxy builder from add colleciton dialog in cmsShow