Removed a bunch of #if USING_V5_SDK since it is no longer necessary (we no longer build against V4)
Merge remote-tracking branch 'origin/master' into sr6