[#69576804] [#69576946] [#69577712] [#69577564] [#69579010] [#69577238] [#69576332] [#69576380]

69576804 - done
69576946 - done
69577400 - currently this is not done as the button is disabled for
fileUploads story.
69577712 - done.
69577564 - done
69579010 - done.
69577238 - done.
69576380 - done.
69576332 - done.
Merge branch 'webapp_apr18' into python