fixed a merging error from some clean up that happened since the original changes from Sunanda

[andersonjacob]

This should be the same as #3776. @bsunanda Can you have a look to see that this gets all of your changes?

[cmsbuild]

A new Pull Request was created by @andersonjacob for CMSSW_6_2_X_SLHC.

fixed a merging error from some clean up that happened since the original changes from Sunanda

It involves the following packages:

Geometry/MuonCommonData

@civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please review it and eventually sign? Thanks.
@ghellwig this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@andersonjacob, @mark-grimes you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[andersonjacob]

merge

tested with #3885 and reported there