Merge proposals dependent on lp:~cjwatson/storm/clarify-no-allow-none-default-none-exception

1. clarify-no-allow-none-default-none-exception
2. Dependent merge proposals