Fix a bug where we did not properly take into account current_constraints when setting up initial conditions. This was correct until yesterday because then we had put all relevant constraints into 'constraints', but now they may reside in 'current_constraints'.
Merge branch 'master' of https://github.com/geodynamics/aspect