Squashed commit of the following:

commit 1c266bf69d6e56fe15533916b29dc4c9650b28e4
Author: sdm86 <sdm86@cornell.edu>
Date:   Tue Jun 24 16:20:11 2014 -0400

    added in a deprecated method missing from 5.2, also minor formatting

commit ab4c532fc4209144448d124ca91895317e8dceda
Author: sdm86 <sdm86@cornell.edu>
Date:   Tue Jun 24 16:17:37 2014 -0400

    Removed class casts that were removed in the 5.1 to 5.2 dev process,
    pulled in an additional logical condition as well

commit a1f99a17c2569d36ddb0efaadfab7e49edf726cc
Author: Steven Manning <sdm86@cornell.edu>
Date:   Tue Jun 24 14:44:57 2014 -0400

    Removed commented out lines that are no longer in the 5.2 codebase, added
    in override annotation we were missing

KFSUPGRADE-976
    added in a deprecated method missing from 5.2, also minor formatting

    Removed class casts that were removed in the 5.1 to 5.2 dev process,
    pulled in an additional logical condition as well

    Removed commented out lines that are no longer in the 5.2 codebase, added