Merge proposals dependent on lp:~javier.collado/utah/docstrings-use-raises-instead-of-throws

1. docstrings-use-raises-instead-of-throws
2. Dependent merge proposals