Fix up specs that failed when maximumSpecCallbackDepth is set to 1
minimal reformat as we're trying to track down why Chrome locks up when debugging Jasmine tests.
Merge remote-tracking branch 'remotes/pivotal-original/master'