Additional code cleanups ; Short option name for --python-script in type...

Additional code cleanups ; Short option name for --python-script in type summary add moved from -s to -o (this is a preliminary step in moving the short option for --summary-string from -f to -s) ; Accordingly updated the test suite

llvm-svn: 138315