Removed conflict line that was left from last merge
Removing from the master branch code that should only appear in the asp/asap branch
Merge branch 'master' into asp

Conflicts:
	include/clang/Basic/Attr.td
	include/clang/Basic/DiagnosticSemaKinds.td
	lib/StaticAnalyzer/Checkers/Checkers.td
	lib/StaticAnalyzer/Checkers/StaticVariableAccessChecker.cpp
	test/SemaCXX/attr-asap-duplicate_attrs.cpp
	test/SemaCXX/attr-asap-misplaced_region.cpp
	test/SemaCXX/attr-asap-regions.cpp
	test/SemaCXX/attr-asap-wrong_number_of_args.cpp

Some of these conflicts happened after removing ASaP code that had erroneously
leaked into the master branch.
Updating the Parsing of asap attributes which was broken by previous merge.