Co pullr2

Take3, merge tentative using branch that contain commits for: rst formating and CLOUDSTACK-5954.