Cherry pick master_tops restore
Restore master_tops functionality and add more documentation.
Fix stray if statement
Merge commit
Add 2014.1.7 release notes
merge commit
merge commit