bug 1077136 - fix doc bug and merge from master
bug 1077136 - fix doc bug and merge from master

vaishalitekale/treeherder,parkouss/treeherder,moijes12/treeherder,KWierso/treeherder,tojon/treeherder,deathping1994/treeherder,KWierso/treeherder,rail/treeherder,adusca/treeherder,glenn124f/treeherder,tojonmz/treeherder,sylvestre/treeherder,tojon/treeherder,adusca/treeherder,avih/treeherder,sylvestre/treeherder,gbrmachado/treeherder,adusca/treeherder,rail/treeherder,deathping1994/treeherder,parkouss/treeherder,sylvestre/treeherder,gbrmachado/treeherder,akhileshpillai/treeherder,deathping1994/treeherder,rail/treeherder,glenn124f/treeherder,tojonmz/treeherder,jgraham/treeherder,gbrmachado/treeherder,vaishalitekale/treeherder,glenn124f/treeherder,KWierso/treeherder,wlach/treeherder,gbrmachado/treeherder,jgraham/treeherder,akhileshpillai/treeherder,vaishalitekale/treeherder,moijes12/treeherder,deathping1994/treeherder,avih/treeherder,jgraham/treeherder,tojon/treeherder,edmorley/treeherder,glenn124f/treeherder,deathping1994/treeherder,adusca/treeherder,gbrmachado/treeherder,rail/treeherder,tojonmz/treeherder,wlach/treeherder,tojonmz/treeherder,kapy2010/treeherder,avih/treeherder,edmorley/treeherder,moijes12/treeherder,jgraham/treeherder,moijes12/treeherder,avih/treeherder,KWierso/treeherder,glenn124f/treeherder,moijes12/treeherder,akhileshpillai/treeherder,jgraham/treeherder,gbrmachado/treeherder,wlach/treeherder,jgraham/treeherder,moijes12/treeherder,tojonmz/treeherder,sylvestre/treeherder,avih/treeherder,akhileshpillai/treeherder,adusca/treeherder,tojonmz/treeherder,vaishalitekale/treeherder,vaishalitekale/treeherder,wlach/treeherder,adusca/treeherder,avih/treeherder,rail/treeherder,akhileshpillai/treeherder,parkouss/treeherder,wlach/treeherder,deathping1994/treeherder,edmorley/treeherder,parkouss/treeherder,glenn124f/treeherder,kapy2010/treeherder,sylvestre/treeherder,tojon/treeherder,wlach/treeherder,parkouss/treeherder,parkouss/treeherder,kapy2010/treeherder,rail/treeherder,kapy2010/treeherder,kapy2010/treeherder,akhileshpillai/treeherder,sylvestre/treeherder,edmorley/treeherder,vaishalitekale/treeherder