Revert an accidental reversal of a docstring when we were resolving merge conflicts
Revert an accidental reversal of a docstring when we were resolving merge conflicts

lukemarsden/flocker,beni55/flocker,lukemarsden/flocker,LaynePeng/flocker,1d4Nf6/flocker,wallnerryan/flocker-profiles,jml/flocker,agonzalezro/flocker,agonzalezro/flocker,wallnerryan/flocker-profiles,beni55/flocker,1d4Nf6/flocker,achanda/flocker,runcom/flocker,jml/flocker,moypray/flocker,beni55/flocker,runcom/flocker,agonzalezro/flocker,AndyHuu/flocker,achanda/flocker,Azulinho/flocker,adamtheturtle/flocker,Azulinho/flocker,mbrukman/flocker,wallnerryan/flocker-profiles,jml/flocker,Azulinho/flocker,w4ngyi/flocker,adamtheturtle/flocker,hackday-profilers/flocker,achanda/flocker,w4ngyi/flocker,LaynePeng/flocker,1d4Nf6/flocker,moypray/flocker,mbrukman/flocker,adamtheturtle/flocker,runcom/flocker,lukemarsden/flocker,hackday-profilers/flocker,w4ngyi/flocker,AndyHuu/flocker,AndyHuu/flocker,LaynePeng/flocker,mbrukman/flocker,moypray/flocker,hackday-profilers/flocker