Fix jar task broken by 87c3499

The :provided scope profiles were not being captured before un-merging
profiles.
Fix aliasing recursion with with-profile

If an alias uses with-profile, then the alias was not being handled
correctly, causing a stack overflow.

e.g

    {:user {"plz" ["with-profile" "+plz" "plz"]}
     :plz {:plugins [[lein-plz "0.2.1"]]}}

    lein plz
Merge pull request #1689 from hugoduncan/fix-with-profile-aliases

Fix aliasing recursion with with-profile
Bump nREPL version to 0.2.6
Merge pull request #1688 from hugoduncan/fix-jar-refactoring

Fix jar task broken by 87c3499
Depend directly on nrepl/clojure-complete.

[ci skip]
Release 2.5.0
Merge remote-tracking branch 'upstream/master'

Conflicts:
	leiningen-core/pom.xml